web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sfPassword' into ro

Browse Source
This commit is contained in:
yflory
2019-10-22 17:26:32 +02:00
parent e6267a89ff 126f10b782
commit 9477ae0895
14 changed files with 199 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/drive-ui.js
View File

@@ -1878,6 +1878,12 @@ define([
$span.addClass('cp-app-drive-element-sharedf');
_addOwnership($span, $state, data);
var hrefData = Hash.parsePadUrl(data.href || data.roHref);
if (hrefData.hashData && hrefData.hashData.password) {
var $password = $passwordIcon.clone().appendTo($state);
$password.attr('title', Messages.fm_passwordProtected || '');
}
var $shared = $sharedIcon.clone().appendTo($state);
$shared.attr('title', Messages.fm_canBeShared);
}
@@ -4515,7 +4521,7 @@ define([
onClose: cb
});
};
if (typeof (deprecated) === "object") {
if (typeof (deprecated) === "object" && APP.editable) {
Object.keys(deprecated).forEach(function (fId) {
var data = deprecated[fId];
var sfId = manager.user.userObject.getSFIdFromHref(data.href);