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

[folder perm] fixup for 'path'

Browse Source
This commit is contained in:
llj
2018-08-01 18:15:40 +08:00
parent efbfbb42c7
commit bc7184f75b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
static/scripts/app/views/dirent-grid.js
View File

@@ -262,9 +262,10 @@ define([
}, },
setFolderPerm: function() { setFolderPerm: function() {
var obj_name = this.model.get('obj_name');
var options = { var options = {
'obj_name': this.model.get('obj_name'), 'obj_name': obj_name,
'dir_path': this.dir.path, 'dir_path': Common.pathJoin([this.dir.path, obj_name]),
'repo_id': this.dir.repo_id, 'repo_id': this.dir.repo_id,
'is_group_owned_repo': this.dir.user_can_set_folder_perm ? true : false 'is_group_owned_repo': this.dir.user_can_set_folder_perm ? true : false
}; };

5
static/scripts/app/views/dirent.js
View File

@@ -552,9 +552,10 @@ define([
setFolderPerm: function() { setFolderPerm: function() {
this.hideMobileMenu(); this.hideMobileMenu();
var obj_name = this.model.get('obj_name');
var options = { var options = {
'obj_name': this.model.get('obj_name'), 'obj_name': obj_name,
'dir_path': this.dir.path, 'dir_path': Common.pathJoin([this.dir.path, obj_name]),
'repo_id': this.dir.repo_id, 'repo_id': this.dir.repo_id,
'is_group_owned_repo': this.dir.user_can_set_folder_perm ? true : false 'is_group_owned_repo': this.dir.user_can_set_folder_perm ? true : false
}; };

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

@@ -18,11 +18,9 @@ define([
initialize: function(options) { initialize: function(options) {
this.repo_id = options.repo_id; this.repo_id = options.repo_id;
this.obj_name = options.obj_name; this.obj_name = options.obj_name;
this.dir_path = options.dir_path; this.path = options.dir_path;
this.is_group_owned_repo = options.is_group_owned_repo; this.is_group_owned_repo = options.is_group_owned_repo;
this.group_id = options.group_id; this.group_id = options.group_id;
this.path = this.dir_path == '/' ? '/' :
Common.pathJoin([this.dir_path, this.obj_name]);
this.render(); this.render();