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

Folder perm group (#2261)

Browse Source 
* update shareable-groups api

return all groups, include address book groups

* update folder perm select group

send ajax groups request every time set folder perm
This commit is contained in:
lian
2018-08-08 17:52:16 +08:00
committed by llj
parent 54a01b495b
commit 8bb7b15082
3 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
static/scripts/app/views/folder-perm.js
View File

@@ -122,7 +122,7 @@ define([
Common.contactInputOptionsForSelect2({'url': url}));
// use select2 to 'group' input in 'add group perm'
var groups;
var groups, groups_url;
var prepareGroupSelector = function(groups) {
var g_opts = '';
for (var i = 0, len = groups.length; i < len; i++) {
@@ -133,28 +133,26 @@ define([
escapeMarkup: function(m) { return m; }
});
};
if (this.is_group_owned_repo) {
$.ajax({
url: Common.getUrl({
'name': 'address_book_sub_groups',
'group_id': this.group_id
}),
cache: false,
dataType: 'json',
success: function(data) {
groups = data;
},
error: function(xhr) {
groups = [];
},
complete: function() {
prepareGroupSelector(groups);
}
});
groups_url = Common.getUrl({'name': 'address_book_sub_groups', 'group_id': this.group_id});
} else {
groups = app.pageOptions.joined_groups_exclude_address_book || [];
prepareGroupSelector(groups);
groups_url = Common.getUrl({name: app.pageOptions.enable_share_to_all_groups ? 'shareable_groups' : 'groups'});
}
$.ajax({
url: groups_url,
cache: false,
dataType: 'json',
success: function(data) {
groups = data;
},
error: function(xhr) {
groups = [];
},
complete: function() {
prepareGroupSelector(groups);
}
});
},
events: {