Jkmarx/hot fix owner name r 1.6.2 (#2510)

* Update share response with owner_profile uuid. * Add a None clause. * Save ownersName to service. * Return is_owner field. * Update ownerName unit test.
refinery-platform · Jan 22, 2018 · 9c0fe3d · 9c0fe3d
1 parent b2382eb
commit 9c0fe3d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/refinery/core/api.py b/refinery/core/api.py
@@ -189,10 +189,11 @@ def transform_res_list(self, user, res_list, request, **kwargs):
             for res in res_list:
                 is_owner = res.id in owned_res_set
                 setattr(res, 'is_owner', is_owner)
+                owner = res.get_owner()
                 setattr(
                     res,
                     'owner',
-                    user_uuid if is_owner else None
+                    owner.profile.uuid if owner is not None else owner
                 )
                 setattr(
                     res,
@@ -333,6 +334,7 @@ def res_sharing(self, request, **kwargs):
 
             perm_obj = {
                 'owner': mod_res[0].owner,
+                'is_owner': mod_res[0].is_owner,
                 'share_list': mod_res[0].share_list,
                 'user_perms': user_perms
             }

diff --git a/refinery/ui/source/js/data-set-about/ctrls/sharing-ctrl.js b/refinery/ui/source/js/data-set-about/ctrls/sharing-ctrl.js
@@ -12,7 +12,7 @@ function AboutSharingCtrl (
   var vm = this;
   vm.dataSetSharing = dataSetPermsService.dataSetSharing;
   vm.groupList = dataSetPermsService.groupList;
-  vm.ownerName = '';
+  vm.ownerName = dataSetPermsService.ownerName;
 
   vm.refreshDataSetSharing = function () {
     var dataSetUuid = $window.dataSetUuid;
@@ -31,10 +31,11 @@ function AboutSharingCtrl (
   vm.refreshOwnerName = function (userUuid) {
     userService.get(userUuid).then(function (response) {
       if (_.has(response, 'fullName') && response.fullName) {
-        vm.ownerName = response.fullName;
+        dataSetPermsService.ownerName = response.fullName;
       } else if (_.has(response, 'userName') && response.userName) {
-        vm.ownerName = response.userName;
+        dataSetPermsService.ownerName = response.userName;
       }
+      vm.ownerName = dataSetPermsService.ownerName;
     });
   };
 

diff --git a/refinery/ui/source/js/file-browser/services/data-set-perms-service.js b/refinery/ui/source/js/file-browser/services/data-set-perms-service.js
@@ -12,6 +12,7 @@
     vm.dataSetSharing = {};
     vm.groupList = [];
     vm.owner = '';
+    vm.ownerName = '';
     vm.getDataSetSharing = getDataSetSharing;
     vm.userPerms = 'none';
 

diff --git a/refinery/ui/source/js/file-browser/services/data-set-perms-service.spec.js b/refinery/ui/source/js/file-browser/services/data-set-perms-service.spec.js
@@ -25,6 +25,7 @@
       expect(factory.dataSetSharing).toEqual({});
       expect(factory.groupList).toEqual([]);
       expect(factory.owner).toEqual('');
+      expect(factory.ownerName).toEqual('');
     });
 
     describe('refreshDataSetPerms', function () {