reloading folder for multiple users
This commit is contained in:
parent
c5f479a349
commit
dce72cffd9
2 changed files with 26 additions and 18 deletions
|
@ -647,21 +647,22 @@ define([
|
|||
|
||||
return $div;
|
||||
};
|
||||
|
||||
$(addBtn).click(function () {
|
||||
var priv = metadataMgr.getPrivateData();
|
||||
var user = metadataMgr.getUserData();
|
||||
var teamsData = Util.tryParse(JSON.stringify(priv.teams)) || {};
|
||||
|
||||
|
||||
var $div = $div2.find('.cp-share-column');
|
||||
// Check selection
|
||||
var $sel = $div.find('.cp-usergrid-user.cp-selected');
|
||||
var sel = $sel.toArray();
|
||||
if (!sel.length) { return; }
|
||||
var friend;
|
||||
|
||||
var curves = [];
|
||||
var toAdd = sel.map(function (el) {
|
||||
var curve = $(el).attr('data-curve');
|
||||
friend = friends[curve]
|
||||
curves.push(curve);
|
||||
var teamId = $(el).attr('data-teamid');
|
||||
// If the pad is woned by a team, we can transfer ownership to ourselves
|
||||
if (curve === user.curvePublic && teamOwner) { return priv.edPublic; }
|
||||
|
@ -693,14 +694,17 @@ define([
|
|||
}, waitFor(function (err, res) {
|
||||
err = err || (res && res.error);
|
||||
redrawAll(true);
|
||||
common.mailbox.sendTo("ADD_TO_ACCESS_LIST", {
|
||||
channel: channel,
|
||||
title: data.title || title,
|
||||
}, {
|
||||
channel: friend.notifications,
|
||||
curvePublic: friend.curvePublic
|
||||
curves.forEach(function(curve){
|
||||
common.mailbox.sendTo("ADD_TO_ACCESS_LIST", {
|
||||
channel: channel,
|
||||
}, {
|
||||
channel: friends[curve].notifications,
|
||||
curvePublic: friends[curve].curvePublic
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
if (err) {
|
||||
waitFor.abort();
|
||||
var text = err === "INSUFFICIENT_PERMISSIONS" ? Messages.fm_forbidden
|
||||
|
|
|
@ -357,15 +357,19 @@ define([
|
|||
var res = store.manager.findChannel(channel);
|
||||
if (!res.length) { return; }
|
||||
|
||||
var data = res[0];
|
||||
var id = data.id // check if that's correct
|
||||
// var teamId = store.data.blockId;
|
||||
ctx.Store.loadSharedFolder(null, id, data, function () {
|
||||
// callback of loadSharefFolder, nothing to do here
|
||||
}, undefined);
|
||||
});
|
||||
var data = res[0].data;
|
||||
var id = res[0].id;
|
||||
var teamId = store.id;
|
||||
var parsed = Hash.parsePadUrl(data.href || data.roHref);
|
||||
if (parsed) {
|
||||
ctx.Store.loadSharedFolder(teamId, id, data, function () {
|
||||
}, false);
|
||||
} else {
|
||||
//handle invalid ref/href
|
||||
}
|
||||
});
|
||||
|
||||
cb(true)
|
||||
cb(true);
|
||||
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue