From fd9dc4b4e87a98ce478b31161ba089e2bfb9650b Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Wed, 26 Oct 2016 22:17:17 +0300
Subject: [PATCH] Update controller/view name

---
 rd_ui/app/scripts/controllers/controllers.js                | 4 ++--
 rd_ui/app/scripts/controllers/dashboard.js                  | 6 +++---
 rd_ui/app/scripts/controllers/query_view.js                 | 6 +++---
 rd_ui/app/views/dashboard.html                              | 2 +-
 .../{share_permissions.html => manage_permissions.html}     | 0
 rd_ui/app/views/query.html                                  | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename rd_ui/app/views/dialogs/{share_permissions.html => manage_permissions.html} (100%)

diff --git a/rd_ui/app/scripts/controllers/controllers.js b/rd_ui/app/scripts/controllers/controllers.js
index 4602c598c..35406a050 100644
--- a/rd_ui/app/scripts/controllers/controllers.js
+++ b/rd_ui/app/scripts/controllers/controllers.js
@@ -157,7 +157,7 @@
   };
 
   // Controller for modal window share_permissions, works for both query and dashboards, needs apiAccess set in scope
-  var SharePermissionsCtrl = function ($scope, $http, $modalInstance, User) {
+  var ManagePermissionsCtrl = function ($scope, $http, $modalInstance, User) {
       $scope.grantees = [];
       $scope.newGrantees = {};
 
@@ -227,5 +227,5 @@
     .controller('IndexCtrl', ['$scope', 'Events', 'Dashboard', 'Query', IndexCtrl])
     .controller('MainCtrl', ['$scope', '$location', 'Dashboard', MainCtrl])
     .controller('QuerySearchCtrl', ['$scope', '$location', '$filter', 'Events', 'Query',  QuerySearchCtrl])
-    .controller('SharePermissionsCtrl', ['$scope', '$http', '$modalInstance', 'User', SharePermissionsCtrl]);
+    .controller('ManagePermissionsCtrl', ['$scope', '$http', '$modalInstance', 'User', ManagePermissionsCtrl]);
 })();
diff --git a/rd_ui/app/scripts/controllers/dashboard.js b/rd_ui/app/scripts/controllers/dashboard.js
index 0be93da50..7c51b1085 100644
--- a/rd_ui/app/scripts/controllers/dashboard.js
+++ b/rd_ui/app/scripts/controllers/dashboard.js
@@ -117,15 +117,15 @@
       }
     };
 
-    $scope.showSharePermissionsModal = function() {
+    $scope.showManagePermissionsModal = function() {
         // Create scope for share permissions dialog and pass api path to it
         var scope = $scope.$new();
         $scope.apiAccess = 'api/dashboards/' + $scope.dashboard.id + '/acl';
 
         $modal.open({
           scope: scope,
-          templateUrl: '/views/dialogs/share_permissions.html',
-          controller: 'SharePermissionsCtrl'
+          templateUrl: '/views/dialogs/manage_permissions.html',
+          controller: 'ManagePermissionsCtrl'
         });
     };
 
diff --git a/rd_ui/app/scripts/controllers/query_view.js b/rd_ui/app/scripts/controllers/query_view.js
index 85543aba0..6182bde93 100644
--- a/rd_ui/app/scripts/controllers/query_view.js
+++ b/rd_ui/app/scripts/controllers/query_view.js
@@ -348,15 +348,15 @@
       $scope.selectedTab = hash || DEFAULT_TAB;
     });
 
-    $scope.showSharePermissionsModal = function() {
+    $scope.showManagePermissionsModal = function() {
       // Create scope for share permissions dialog and pass api path to it
       var scope = $scope.$new();
       $scope.apiAccess = 'api/queries/' + $routeParams.queryId + '/acl';
 
       $modal.open({
         scope: scope,
-        templateUrl: '/views/dialogs/share_permissions.html',
-        controller: 'SharePermissionsCtrl'
+        templateUrl: '/views/dialogs/manage_permissions.html',
+        controller: 'ManagePermissionsCtrl'
       })
     };
   };
diff --git a/rd_ui/app/views/dashboard.html b/rd_ui/app/views/dashboard.html
index 5138fb5bc..055903b43 100644
--- a/rd_ui/app/views/dashboard.html
+++ b/rd_ui/app/views/dashboard.html
@@ -21,7 +21,7 @@
         <ul class="dropdown-menu pull-right" dropdown-menu>
           <li><a data-toggle="modal" hash-link hash="edit_dashboard_dialog">Edit Dashboard</a></li>
           <li><a data-toggle="modal" hash-link hash="add_query_dialog">Add Widget</a></li>
-          <li ng-if="showPermissionsControl"><a ng-click="showSharePermissionsModal()">Manage Permissions</a></li>
+          <li ng-if="showPermissionsControl"><a ng-click="showManagePermissionsModal()">Manage Permissions</a></li>
           <li ng-if="!dashboard.is_archived"><a ng-click="archiveDashboard()">Archive Dashboard</a></li>
         </ul>
       </div>
diff --git a/rd_ui/app/views/dialogs/share_permissions.html b/rd_ui/app/views/dialogs/manage_permissions.html
similarity index 100%
rename from rd_ui/app/views/dialogs/share_permissions.html
rename to rd_ui/app/views/dialogs/manage_permissions.html
diff --git a/rd_ui/app/views/query.html b/rd_ui/app/views/query.html
index 91b86f552..ed8ead136 100644
--- a/rd_ui/app/views/query.html
+++ b/rd_ui/app/views/query.html
@@ -125,7 +125,7 @@
                   </button>
                   <ul class="dropdown-menu pull-right" dropdown-menu>
                     <li ng-if="!query.is_archived && query.id != undefined && (isQueryOwner || currentUser.hasPermission('admin'))"><a hash-link hash="archive-confirmation-modal" data-toggle="modal">Archive Query</a></li>
-                    <li ng-if="!query.is_archived && query.id != undefined && (isQueryOwner || currentUser.hasPermission('admin')) && showPermissionsControl"><a ng-click="showSharePermissionsModal()">Manage Permissions</a></li>
+                    <li ng-if="!query.is_archived && query.id != undefined && (isQueryOwner || currentUser.hasPermission('admin')) && showPermissionsControl"><a ng-click="showManagePermissionsModal()">Manage Permissions</a></li>
                     <li ng-if="query.id != undefined"><a ng-click="showApiKey()">Show API Key</a></li>
                   </ul>
                 </div>