diff --git a/frontend/src/components/dialog/share-to-group.js b/frontend/src/components/dialog/share-to-group.js index f672f73dc3..331614d9a4 100644 --- a/frontend/src/components/dialog/share-to-group.js +++ b/frontend/src/components/dialog/share-to-group.js @@ -34,7 +34,7 @@ class GroupItem extends React.Component { return ( {item.group_info.name} - {Utils.sharePerms[item.permission]} + {Utils.sharePerms(item.permission)} {item.user_info.nickname} - {Utils.sharePerms[item.permission]} + {Utils.sharePerms(item.permission)} {Utils.sharePerms[options.perm]}; + return ; }; const item = ( diff --git a/frontend/src/pages/share-admin/libraries.js b/frontend/src/pages/share-admin/libraries.js index 1de7e0d875..13416eef85 100644 --- a/frontend/src/pages/share-admin/libraries.js +++ b/frontend/src/pages/share-admin/libraries.js @@ -204,14 +204,14 @@ class Item extends Component { if (data.show_admin && is_admin) { data.cur_perm = 'admin'; } - data.cur_perm_text = Utils.sharePerms[data.cur_perm]; + data.cur_perm_text = Utils.sharePerms(data.cur_perm); let iconVisibility = this.state.showOpIcon ? '' : ' invisible'; let editIconClassName = 'perm-edit-icon sf2-icon-edit op-icon' + iconVisibility; let unshareIconClassName = 'unshare op-icon sf2-icon-delete' + iconVisibility; let permOption = function(options) { - return ; + return ; }; const item = ( diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js index b703b1459b..d17a74c074 100644 --- a/frontend/src/utils/utils.js +++ b/frontend/src/utils/utils.js @@ -302,12 +302,26 @@ export const Utils = { return title; }, - sharePerms: { - 'rw': gettext("Read-Write"), - 'r': gettext("Read-Only"), - 'admin': gettext("Admin"), - 'cloud-edit': gettext("Preview-Edit-on-Cloud"), - 'preview': gettext("Preview-on-Cloud") + sharePerms: function(permission) { + var title; + switch(permission) { + case 'rw': + title = gettext("Read-Write"); + break; + case 'r': + title = gettext("Read-Only"); + break; + case 'admin': + title = gettext("Admin"); + break; + case 'cloud-edit': + title = gettext("Preview-Edit-on-Cloud"); + break; + case 'preview': + title = gettext("Preview-on-Cloud"); + break; + } + return title; }, formatSize: function(options) { diff --git a/seahub/templates/view_file_markdown.html b/seahub/templates/view_file_markdown.html index 2bac940364..80a94ebef3 100644 --- a/seahub/templates/view_file_markdown.html +++ b/seahub/templates/view_file_markdown.html @@ -20,6 +20,7 @@ }, pageOptions: { repoID: '{{ repo.id }}', + repoName: '{{ repo.name|escapejs }}', filePath: '{{ path|escapejs }}', fileName: '{{ filename|escapejs }}', domain: '{{ domain }}',