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

Disable 'forget' button for pads in read-only teams

Browse Source
This commit is contained in:
yflory
2019-10-29 12:24:44 +01:00
parent 57a402da72
commit 96968f2076
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1528,8 +1528,12 @@ define([
} }
UI.confirm(msg, function (yes) { UI.confirm(msg, function (yes) {
if (!yes) { return; } if (!yes) { return; }
sframeChan.query('Q_MOVE_TO_TRASH', null, function (err) { sframeChan.query('Q_MOVE_TO_TRASH', null, function (err, obj) {
if (err) { return void callback(err); } err = err || (obj && obj.error);
if (err) {
callback(err);
return void UI.warn(Messages.fm_forbidden);
}
var cMsg = common.isLoggedIn() ? Messages.movedToTrash : Messages.deleted; var cMsg = common.isLoggedIn() ? Messages.movedToTrash : Messages.deleted;
var msg = common.fixLinks($('<div>').html(cMsg)); var msg = common.fixLinks($('<div>').html(cMsg));
UI.alert(msg); UI.alert(msg);

8
www/common/outer/async-store.js
View File

@@ -986,17 +986,23 @@ define([
}; };
Store.moveToTrash = function (clientId, data, cb) { Store.moveToTrash = function (clientId, data, cb) {
var href = Hash.getRelativeHref(data.href); var href = Hash.getRelativeHref(data.href);
var allErrors = true;
nThen(function (waitFor) { nThen(function (waitFor) {
getAllStores().forEach(function (s) { getAllStores().forEach(function (s) {
var deleted = s.userObject.forget(href); var deleted = s.userObject.forget(href);
if (!deleted) { return; } if (!deleted) { return; }
allErrors = false;
var send = s.id ? s.sendEvent : sendDriveEvent; var send = s.id ? s.sendEvent : sendDriveEvent;
send('DRIVE_CHANGE', { send('DRIVE_CHANGE', {
path: ['drive', UserObject.FILES_DATA] path: ['drive', UserObject.FILES_DATA]
}, clientId); }, clientId);
onSync(s.id, waitFor()); onSync(s.id, waitFor());
}); });
}).nThen(cb); }).nThen(function () {
cb({
error: allErrors ? 'FORBIDDEN' : undefined
});
});
}; };
Store.setPadTitle = function (clientId, data, cb) { Store.setPadTitle = function (clientId, data, cb) {
var title = data.title; var title = data.title;

2
www/common/proxy-manager.js
View File

@@ -124,7 +124,7 @@ define([
var data = Env.user.proxy[UserObject.SHARED_FOLDERS][id]; var data = Env.user.proxy[UserObject.SHARED_FOLDERS][id];
if (data && !editable) { data = JSON.parse(JSON.stringify(data)); } if (data && !editable) { data = JSON.parse(JSON.stringify(data)); }
// If it's not a shared folder, check the pads // If it's not a shared folder, check the pads
if (!data) { Env.user.userObject.getFileData(id, editable); } if (!data) { data = Env.user.userObject.getFileData(id, editable); }
ret.push({ ret.push({
data: data, data: data,
userObject: Env.user.userObject userObject: Env.user.userObject