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

Merge pull request #1014 from haiwen/turn-group-wiki

Browse Source 
Turn on/off group Wiki
This commit is contained in:
Daniel Pan
2016-02-19 17:29:41 +08:00
parent a7eecaeff4 4dd0015cba
commit 4179a13c4c
12 changed files with 154 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/scripts/app/router.js
View File

@@ -26,7 +26,6 @@ define([
'group/:group_id/': 'showGroupRepos',
'group/:group_id/lib/:repo_id(/*path)': 'showGroupRepoDir',
'group/:group_id/members/': 'showGroupMembers',
'group/:group_id/settings/': 'showGroupSettings',
'org/': 'showOrgRepos',
'org/lib/:repo_id(/*path)': 'showOrgRepoDir',
'common/lib/:repo_id(/*path)': 'showCommonDir',
@@ -190,11 +189,6 @@ define([
this.groupView.showMembers();
},
showGroupSettings: function(group_id) {
this.showGroupRepos(group_id);
this.groupView.showSettings();
},
showOrgRepos: function() {
this.switchCurrentView(this.orgView);
this.orgView.showRepoList();

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

@@ -21,9 +21,7 @@ define([
// group basic info
this.group = {};
this.$loadingTip = this.$('.loading-tip');
this.$listContainer = $('#group-setting-con');
this.$error = this.$('.error');
this.$listContainer = $('#group-setting-con');
var _this = this;
$(window).resize(function() {
@@ -39,7 +37,7 @@ define([
!$popup.find('*').is(target) &&
!$popup_switch.is(target)) {
_this.hide();
}
}
});
},
@@ -51,49 +49,22 @@ define([
},
render: function() {
this.$error.hide();
this.$listContainer.hide();
this.$loadingTip.show();
// the user's role in this group
this.is_owner = false,
this.is_admin = false;
var _this = this;
$.ajax({
url: Common.getUrl({
'name': 'group',
'group_id': this.group.id
}),
cache: false,
dataType: 'json',
success: function(data) {
_this.group = data; // {id, name, owner, created_at, avatar_url, admins}
var username = app.pageOptions.username;
if (username == _this.group.owner) {
_this.is_owner = true;
} else if ($.inArray(username, _this.group.admins) != -1) {
_this.is_admin = true;
}
_this.$listContainer.html(_this.template({
'is_owner': _this.is_owner,
'is_admin': _this.is_admin
})).show();
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = gettext('Error');
} else {
err_msg = gettext("Please check the network.");
}
_this.$error.html(err_msg).show();
},
complete: function() {
_this.$loadingTip.hide();
}
});
if (app.pageOptions.username == this.group.owner) {
this.is_owner = true;
} else if ($.inArray(app.pageOptions.username, this.group.admins) != -1) {
this.is_admin = true;
}
this.$listContainer.html(this.template({
'is_owner': this.is_owner,
'is_admin': this.is_admin,
'wiki_enabled': this.group.wiki_enabled
})).show();
},
// set max-height for '.popover-con'
@@ -102,16 +73,14 @@ define([
},
show: function(options) {
this.group.id = options.group_id;
this.group = options.group;
this.$el.show();
this.setConMaxHeight();
this.render();
app.router.navigate('group/' + this.group.id + '/settings/');
this.setConMaxHeight();
},
hide: function() {
this.$el.hide();
app.router.navigate('group/' + this.group.id + '/');
},
highlightItem: function(e) {
@@ -130,6 +99,12 @@ define([
case 'transfer':
this.transfer();
break;
case 'add-wiki':
this.toggleWiki('on');
break;
case 'remove-wiki':
this.toggleWiki('off');
break;
case 'import-members':
this.importMembers();
break;
@@ -153,7 +128,7 @@ define([
$('#simplemodal-container').css({'width':'auto', 'height':'auto'});
$form.submit(function() {
var new_name = $.trim($('[name="new_name"]', $(this)).val());
var new_name = $.trim($('[name="new_name"]', $(this)).val());
if (!new_name || new_name == _this.group.name) {
return false;
}
@@ -161,12 +136,12 @@ define([
Common.disableButton($submitBtn);
$.ajax({
url: Common.getUrl({
'name': 'group',
'name': 'group',
'group_id': _this.group.id
}),
type: 'put',
dataType: 'json',
beforeSend: Common.prepareCSRFToken,
beforeSend: Common.prepareCSRFToken,
data: {
'name': new_name
},
@@ -218,12 +193,12 @@ define([
Common.disableButton($submitBtn);
$.ajax({
url: Common.getUrl({
'name': 'group',
'name': 'group',
'group_id': _this.group.id
}),
type: 'put',
dataType: 'json',
beforeSend: Common.prepareCSRFToken,
beforeSend: Common.prepareCSRFToken,
data: {
'owner': email
},
@@ -246,6 +221,44 @@ define([
});
},
toggleWiki: function(status) {
var _this = this;
var wiki_enabled;
if (status == 'on') {
wiki_enabled = 'true';
} else {
wiki_enabled = 'false';
}
$.ajax({
url: Common.getUrl({
'name': 'group',
'group_id': _this.group.id
}),
type: 'put',
dataType: 'json',
beforeSend: Common.prepareCSRFToken,
data: {
'wiki_enabled': wiki_enabled
},
success: function() {
_this.hide();
_this.groupView.renderGroupTop();
},
error: function(xhr) {
var error_msg;
if (xhr.responseText) {
error_msg = $.parseJSON(xhr.responseText).error_msg;
} else {
error_msg = gettext("Failed. Please check the network.");
}
Common.feedback(error_msg, 'error');
_this.hide();
}
});
},
importMembers: function() {
var _this = this;
var $form = $(this.importMembersTemplate());
@@ -264,12 +277,12 @@ define([
Common.disableButton($submitBtn);
var file = $fileInput.files[0];
var formData = new FormData();
var formData = new FormData();
formData.append('file', file);
$.ajax({
url: Common.getUrl({
'name': 'group_import_members',
'group_id': _this.group.id
'group_id': _this.group.id
}),
type: 'post',
dataType: 'json',
@@ -320,12 +333,12 @@ define([
var yesCallback = function () {
$.ajax({
url: Common.getUrl({
'name': 'group',
'name': 'group',
'group_id': _this.group.id
}),
type: 'delete',
dataType: 'json',
beforeSend: Common.prepareCSRFToken,
beforeSend: Common.prepareCSRFToken,
success: function() {
app.ui.sideNavView.updateGroups();
app.router.navigate('groups/', {trigger: true});

13
static/scripts/app/views/group.js
View File

@@ -21,6 +21,7 @@ define([
events: {
'click #group-settings-icon': 'toggleSettingsPanel',
'click #group-members-icon': 'toggleMembersPanel',
'click #group-wiki-icon': 'showGroupWiki',
'click .repo-create': 'createRepo',
'click .by-name': 'sortByName',
'click .by-time': 'sortByTime'
@@ -34,6 +35,8 @@ define([
this.$loadingTip = this.$('#group-repos .loading-tip');
this.$emptyTip = this.$('#group-repos .empty-tips');
this.group = {}; // will be fetched when rendering the top bar
this.repos = new GroupRepos();
this.listenTo(this.repos, 'add', this.addOne);
this.listenTo(this.repos, 'reset', this.reset);
@@ -42,7 +45,6 @@ define([
this.membersView = new GroupMembersView();
this.settingsView = new GroupSettingsView({
sideNavView: options.sideNavView,
groupView: this
});
},
@@ -90,6 +92,7 @@ define([
cache: false,
dataType: 'json',
success: function (data) {
_this.group = data;
$groupTop.html(_this.groupTopTemplate(data));
},
error: function(xhr) {
@@ -120,7 +123,7 @@ define([
reset: true,
data: {from: 'web'},
success: function (collection, response, opts) {
},
},
error: function (collection, response, opts) {
$loadingTip.hide();
var $error = _this.$('.error');
@@ -206,7 +209,7 @@ define([
showSettings: function() {
this.settingsView.show({
'group_id': this.group_id
'group': this.group
});
},
@@ -219,6 +222,10 @@ define([
}
},
showGroupWiki: function() {
location.href = '/group/' + this.group.id + '/wiki/';
},
showMembers: function() {
this.membersView.show({'group_id': this.group_id});
},