1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-25 08:09:43 +02:00

Fix change folder owner action

This commit is contained in:
zinyando 2016-08-24 13:09:38 +02:00
parent ee977c977a
commit abac9347e1
3 changed files with 17 additions and 18 deletions

View file

@ -27,16 +27,15 @@ export default Ember.Controller.extend(NotifierMixin, {
actions: { actions: {
changeOwner: function (folderId, userId) { changeOwner: function (folderId, userId) {
let self = this; this.get('folderService').getFolder(folderId).then((folder) => {
this.get('folderService').getFolder(folderId).then(function (folder) {
folder.set('userId', userId); folder.set('userId', userId);
self.get('folderService').save(folder).then(function () { this.get('folderService').save(folder).then(() => {
self.showNotification("Changed"); this.showNotification("Changed");
self.audit.record('changed-folder-owner'); this.audit.record('changed-folder-owner');
}); });
self.send('onChangeOwner'); this.send('onChangeOwner');
}); });
} }
} }

View file

@ -29,17 +29,17 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
let nonPrivateFolders = model.rejectBy('folderType', 2); let nonPrivateFolders = model.rejectBy('folderType', 2);
controller.set('folders', nonPrivateFolders); controller.set('folders', nonPrivateFolders);
this.get('folderService').getProtectedFolderInfo().then(function (people) { this.get('folderService').getProtectedFolderInfo().then((people) => {
people.forEach(function (person) { people.forEach((person) => {
person.isEveryone = person.userId === ''; person.set('isEveryone', person.get('userId') === '');
person.isOwner = false; person.set('isOwner', false);
}); });
nonPrivateFolders.forEach(function (folder) { nonPrivateFolders.forEach(function (folder) {
let shared = people.filterBy('folderId', folder.get('id')); let shared = people.filterBy('folderId', folder.get('id'));
let person = shared.findBy('userId', folder.get('userId')); let person = shared.findBy('userId', folder.get('userId'));
if (is.not.undefined(person)) { if (is.not.undefined(person)) {
person.isOwner = true; person.set('isOwner', true);
} }
folder.set('sharedWith', shared); folder.set('sharedWith', shared);

View file

@ -98,7 +98,7 @@ export default BaseService.extend({
data = response.map((obj) => { data = response.map((obj) => {
let data = this.get('store').normalize('protected-folder-participant', obj); let data = this.get('store').normalize('protected-folder-participant', obj);
return this.get('store').push({ data: data }); return this.get('store').push(data);
}); });
return data; return data;