Rename document role to permission

gui/app/components/folder/category-admin.js

@@ -17,7 +17,6 @@ import ModalMixin from '../../mixins/modal';
 import Component from '@ember/component';
 
 export default Component.extend(ModalMixin, TooltipMixin, {
-	// userService: service('user'),
 	spaceSvc: service('folder'),
 	groupSvc: service('group'),
 	categorySvc: service('category'),

gui/app/models/document-permission.js

@@ -15,11 +15,11 @@ import attr from 'ember-data/attr';
 export default Model.extend({
 	orgId: attr('string'),
 	documentId: attr('string'),
-	userId: attr('string'),
-	fullname: attr('string'), // client-side usage only, not from API
-
-	documentEdit: attr('boolean'), 			// space level setting
-	documentApprove: attr('boolean'),		// space level setting
-	documentRoleEdit: attr('boolean'),		// document level setting
-	documentRoleApprove: attr('boolean')	// document level setting
+	whoId: attr('string'),
+	who: attr('string'),
+	name: attr('string'),
+	documentEdit: attr('boolean'),
+	documentApprove: attr('boolean'),
+	documentRoleEdit: attr('boolean'),
+	documentRoleApprove: attr('boolean')
 });

gui/app/serializers/document-permission.js

@@ -4,7 +4,7 @@ export default ApplicationSerializer.extend({
 	normalize(modelClass, resourceHash) {
 		return {
 			data: {
-				id: resourceHash.userId ? resourceHash.userId : 0,
+				id: resourceHash.whoId ? resourceHash.whoId : 0,
 				type: modelClass.modelName,
 				attributes: resourceHash
 			}

gui/app/services/document.js

@@ -343,7 +343,7 @@ export default Service.extend({
 			perms = this.get('store').push(perms);
 			this.get('folderService').set('permissions', perms);
 
-			let roles = this.get('store').normalize('document-role', response.roles);
+			let roles = this.get('store').normalize('document-permission', response.roles);
 			roles = this.get('store').push(roles);
 
 			let folders = response.folders.map((obj) => {