From abac9347e162b8eeb796ba2f2537da1883bcd11c Mon Sep 17 00:00:00 2001
From: zinyando <brizdigital@gmail.com>
Date: Wed, 24 Aug 2016 13:09:38 +0200
Subject: [PATCH] Fix change folder owner action

---
 app/app/pods/customize/folders/controller.js | 17 ++++++++---------
 app/app/pods/customize/folders/route.js      | 16 ++++++++--------
 app/app/services/folder.js                   |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/app/pods/customize/folders/controller.js b/app/app/pods/customize/folders/controller.js
index 83be5a11..c250dff4 100644
--- a/app/app/pods/customize/folders/controller.js
+++ b/app/app/pods/customize/folders/controller.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -27,17 +27,16 @@ export default Ember.Controller.extend(NotifierMixin, {
 
 	actions: {
 		changeOwner: function (folderId, userId) {
-			let self = this;
-			this.get('folderService').getFolder(folderId).then(function (folder) {
+			this.get('folderService').getFolder(folderId).then((folder) => {
 				folder.set('userId', userId);
 
-				self.get('folderService').save(folder).then(function () {
-					self.showNotification("Changed");
-					self.audit.record('changed-folder-owner');
+				this.get('folderService').save(folder).then(() => {
+					this.showNotification("Changed");
+					this.audit.record('changed-folder-owner');
 				});
 
-				self.send('onChangeOwner');
+				this.send('onChangeOwner');
 			});
 		}
 	}
-});
\ No newline at end of file
+});
diff --git a/app/app/pods/customize/folders/route.js b/app/app/pods/customize/folders/route.js
index 9a2a5df2..445d4b89 100644
--- a/app/app/pods/customize/folders/route.js
+++ b/app/app/pods/customize/folders/route.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -29,17 +29,17 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 		let nonPrivateFolders = model.rejectBy('folderType', 2);
 		controller.set('folders', nonPrivateFolders);
 
-		this.get('folderService').getProtectedFolderInfo().then(function (people) {
-			people.forEach(function (person) {
-				person.isEveryone = person.userId === '';
-				person.isOwner = false;
+		this.get('folderService').getProtectedFolderInfo().then((people) => {
+			people.forEach((person) => {
+				person.set('isEveryone', person.get('userId') === '');
+				person.set('isOwner', false);
 			});
 
 			nonPrivateFolders.forEach(function (folder) {
 				let shared = people.filterBy('folderId', folder.get('id'));
 				let person = shared.findBy('userId', folder.get('userId'));
 				if (is.not.undefined(person)) {
-					person.isOwner = true;
+					person.set('isOwner', true);
 				}
 
 				folder.set('sharedWith', shared);
@@ -56,4 +56,4 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 			this.refresh();
 		}
 	}
-});
\ No newline at end of file
+});
diff --git a/app/app/services/folder.js b/app/app/services/folder.js
index b79631c6..d55d598f 100644
--- a/app/app/services/folder.js
+++ b/app/app/services/folder.js
@@ -98,7 +98,7 @@ export default BaseService.extend({
 
 			data = response.map((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;