haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +00:00
Code Issues Releases Wiki Activity

Merge branch '5.1'

Browse Source 
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
This commit is contained in:
Daniel Pan
2016-05-21 13:42:04 +08:00
parent e8a60d3318 ce2648e646
commit ee99d7aad8
123 changed files with 26940 additions and 21385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/scripts/app/views/group-settings.js
View File

@@ -53,7 +53,7 @@ define([
'wiki_enabled': this.groupView.group.wiki_enabled
}));
$("#group").append(this.$el);
$("#group-settings-icon").after(this.$el);
},
highlightItem: function(e) {
@@ -99,7 +99,7 @@ define([
var _this = this;
var $form = $(this.renameTemplate());
$form.modal({focus:false});
$form.modal();
$('#simplemodal-container').css({'width':'auto', 'height':'auto'});
$form.submit(function() {
@@ -160,7 +160,7 @@ define([
if (!email) {
return false;
}
if (email == _this.group.owner) {
if (email == _this.groupView.group.owner) {
return false;
}
@@ -179,6 +179,7 @@ define([
},
success: function() {
// after the transfer, the former owner becomes a common admin of the group.
Common.feedback(gettext("Successfully transferred the group. You are now a normal member of the group."), 'success');
$.modal.close();
},
error: function(xhr) {