jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2026-05-08 18:02:18 -04:00
Code Issues Projects Releases Wiki Activity

Update controller/view name

Browse Source
This commit is contained in:
Arik Fraimovich
2016-10-26 22:17:17 +03:00
parent 52b87efb73
commit fd9dc4b4e8
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rd_ui/app/scripts/controllers/controllers.js
View File

@@ -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]);
})();

6
rd_ui/app/scripts/controllers/dashboard.js
View File

@@ -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'
});
};

6
rd_ui/app/scripts/controllers/query_view.js
View File

@@ -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'
})
};
};

2
rd_ui/app/views/dashboard.html
View File

@@ -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>

0
rd_ui/app/views/dialogs/share_permissions.html → rd_ui/app/views/dialogs/manage_permissions.html
View File

2
rd_ui/app/views/query.html
View File

@@ -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>