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

[file lock] show name instead of email

Browse Source
This commit is contained in:
llj
2015-07-15 10:33:17 +08:00
committed by lian
parent 97ebba6f2b
commit 2aa15a7d19
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
seahub/templates/libraries.html
View File

@@ -234,6 +234,7 @@ app["pageOptions"] = {
return mods_enabled; return mods_enabled;
})(), })(),
username: "{{request.user.username}}", username: "{{request.user.username}}",
name: "{{request.user.username|email2nickname|escapejs}}",
events_enabled: {% if events_enabled %} true {% else %} false {% endif %}, events_enabled: {% if events_enabled %} true {% else %} false {% endif %},
can_add_repo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %}, can_add_repo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %},
can_generate_shared_link: {% if user.permissions.can_generate_shared_link %} true {% else %} false {% endif %}, can_generate_shared_link: {% if user.permissions.can_generate_shared_link %} true {% else %} false {% endif %},

1
seahub/views/ajax.py
View File

@@ -508,6 +508,7 @@ def list_lib_dir(request, repo_id):
if is_pro_version(): if is_pro_version():
f_['is_locked'] = True if f.is_locked else False f_['is_locked'] = True if f.is_locked else False
f_['lock_owner'] = f.lock_owner f_['lock_owner'] = f.lock_owner
f_['lock_owner_name'] = email2nickname(f.lock_owner)
if username == f.lock_owner: if username == f.lock_owner:
f_['locked_by_me'] = True f_['locked_by_me'] = True
else: else:

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

@@ -55,7 +55,7 @@ define([
enable_some_op: enable_some_op, enable_some_op: enable_some_op,
repo_encrypted: dir.encrypted repo_encrypted: dir.encrypted
})); }));
this.$('.file-locked-icon').attr('title', gettext("locked by {placeholder}").replace('{placeholder}', Common.HTMLescape(this.model.get('lock_owner')))); this.$('.file-locked-icon').attr('title', gettext("locked by {placeholder}").replace('{placeholder}', this.model.get('lock_owner_name')));
return this; return this;
}, },
@@ -503,7 +503,7 @@ define([
_this.model.set({ _this.model.set({
'is_locked': true, 'is_locked': true,
'locked_by_me': true, 'locked_by_me': true,
'lock_owner': app.pageOptions.username 'lock_owner_name': app.pageOptions.name
}); });
app.globalState.noFileOpPopup = true; app.globalState.noFileOpPopup = true;
_this.$el.removeClass('hl'); _this.$el.removeClass('hl');