From be0fba276f7890bb14011a441b3429e9fb5c26ee Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Thu, 7 Nov 2013 23:35:27 -0500
Subject: [PATCH] Bug fixes: - Report proper errors when trying to change
permissions - Turn off the auto-caps of the team names - Fix the
is_org_member checks everywhere - Fix resetting of roles if the change was
not successful
---
endpoints/api.py | 17 ++++++++++++++++-
static/css/quay.css | 6 +++---
static/js/app.js | 9 ++++-----
static/js/controllers.js | 27 +++++++++++++++++----------
static/partials/org-view.html | 3 ++-
static/partials/repo-admin.html | 7 ++++---
6 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/endpoints/api.py b/endpoints/api.py
index f167c3e5f..16583d4ed 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1012,6 +1012,13 @@ def change_user_permissions(namespace, repository, username):
except model.InvalidOrganizationException:
# This repository is not part of an organization
pass
+ except model.DataModelException as ex:
+ error_resp = jsonify({
+ 'message': ex.message,
+ })
+ error_resp.status_code = 400
+ return error_resp
+
resp = jsonify(perm_view)
if request.method == 'POST':
@@ -1051,7 +1058,15 @@ def change_team_permissions(namespace, repository, teamname):
def delete_user_permissions(namespace, repository, username):
permission = AdministerRepositoryPermission(namespace, repository)
if permission.can():
- model.delete_user_permission(username, namespace, repository)
+ try:
+ model.delete_user_permission(username, namespace, repository)
+ except model.DataModelException as ex:
+ error_resp = jsonify({
+ 'message': ex.message,
+ })
+ error_resp.status_code = 400
+ return error_resp
+
return make_response('Deleted', 204)
abort(403) # Permission denied
diff --git a/static/css/quay.css b/static/css/quay.css
index 753bd6e13..b0c2d1983 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -32,7 +32,7 @@
}
.organization-header-element .team-name {
- text-transform: capitalize;
+ text-transform: none;
}
.organization-header-element .header-buttons {
@@ -1590,7 +1590,7 @@ p.editable:hover i {
.org-view .team-title {
font-size: 20px;
- text-transform: capitalize;
+ text-transform: none;
padding: 4px;
}
@@ -1608,7 +1608,7 @@ p.editable:hover i {
.org-admin .team-link {
display: inline-block;
- text-transform: capitalize;
+ text-transform: none;
margin-right: 20px;
}
diff --git a/static/js/app.js b/static/js/app.js
index c73caee0e..b20117e6a 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -582,12 +582,11 @@ quayApp.directive('roleGroup', function () {
},
controller: function($scope, $element) {
$scope.setRole = function(role) {
- $scope.currentRole = role;
- if ($scope.roleChanged) {
- if ($scope.changeParams) {
- $scope.changeParams();
- }
+ if ($scope.currentRole == role) { return; }
+ if ($scope.roleChanged) {
$scope.roleChanged({'role': role});
+ } else {
+ $scope.currentRole = role;
}
};
}
diff --git a/static/js/controllers.js b/static/js/controllers.js
index a172c4f25..1c530738f 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -518,7 +518,7 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
// Don't allow duplicates.
if ($scope.permissions[entity.kind][entity.name]) { return; }
- if (!entity.is_org_member) {
+ if (entity.is_org_member === false) {
$scope.currentAddEntity = entity;
$('#confirmaddoutsideModal').modal('show');
return;
@@ -535,9 +535,10 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
var permissionDelete = Restangular.one(getRestUrl('repository', namespace, name, 'permissions', kind, entityName));
permissionDelete.customDELETE().then(function() {
delete $scope.permissions[kind][entityName];
- }, function(result) {
- if (result.status == 409) {
- $('#onlyadminModal').modal({});
+ }, function(resp) {
+ if (resp.status == 409) {
+ $scope.changePermError = resp.data || '';
+ $('#channgechangepermModal').modal({});
} else {
$('#cannotchangeModal').modal({});
}
@@ -570,10 +571,12 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
permission.role = role;
var permissionPut = Restangular.one(getRestUrl('repository', namespace, name, 'permissions', kind, entityName));
- permissionPut.customPUT(permission).then(function() {}, function(result) {
- if (result.status == 409) {
- $scope.permissions[kind][entityName] = currentRole;
- $('#onlyadminModal').modal({});
+ permissionPut.customPUT(permission).then(function() {}, function(resp) {
+ $scope.permissions[kind][entityName] = {'role': currentRole};
+ $scope.changePermError = null;
+ if (resp.status == 409 || resp.data) {
+ $scope.changePermError = resp.data || '';
+ $('#channgechangepermModal').modal({});
} else {
$('#cannotchangeModal').modal({});
}
@@ -1111,13 +1114,17 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
{ 'id': 'admin', 'title': 'Admin', 'kind': 'primary' }
];
- $scope.setRole = function(role, teamname) {
+ $scope.setRole = function(role, teamname) {
+ var previousRole = $scope.organization.teams[teamname].role;
$scope.organization.teams[teamname].role = role;
var updateTeam = Restangular.one(getRestUrl('organization', orgname, 'team', teamname));
var data = $scope.organization.teams[teamname];
+
updateTeam.customPUT(data).then(function(resp) {
- }, function() {
+ }, function(resp) {
+ $scope.organization.teams[teamname].role = previousRole;
+ $scope.roleError = resp.data || '';
$('#cannotChangeTeamModal').modal({});
});
};
diff --git a/static/partials/org-view.html b/static/partials/org-view.html
index f26c35c67..c1011d74f 100644
--- a/static/partials/org-view.html
+++ b/static/partials/org-view.html
@@ -55,7 +55,8 @@
<h4 class="modal-title">Cannot change team</h4>
</div>
<div class="modal-body">
- You do not have permission to change properties on teams.
+ <span ng-show="!roleError">You do not have permission to change properties on teams.</span>
+ <span ng-show="roleError">{{ roleError }}</span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index c23e01121..6c2d3e97b 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -57,7 +57,7 @@
<td class="{{ 'user entity ' + (permission.is_org_member? '' : 'outside') }}">
<i class="fa fa-user"></i>
<span>{{name}}</span>
- <i class="fa fa-exclamation-triangle" ng-show="permission.is_org_member !== undefined && !permission.is_org_member" data-trigger="hover" bs-popover="{'content': 'This user is not a member of the organization'}"></i>
+ <i class="fa fa-exclamation-triangle" ng-show="permission.is_org_member === false" data-trigger="hover" bs-popover="{'content': 'This user is not a member of the organization'}"></i>
</td>
<td class="user-permissions">
<div class="btn-group btn-group-sm">
@@ -263,7 +263,7 @@
<!-- Modal message dialog -->
- <div class="modal fade" id="onlyadminModal">
+ <div class="modal fade" id="channgechangepermModal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -271,7 +271,8 @@
<h4 class="modal-title">Cannot change permissions</h4>
</div>
<div class="modal-body">
- The selected permissions could not be changed because the user is the only <b>admin</b> on the repo.
+ <span ng-show="!changePermError">You do not have permission to change the permissions on the repository.</span>
+ <span ng-show="changePermError">{{ changePermError }}</span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>