vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'orgs' of https://bitbucket.org/yackob03/quay into orgs

Browse source
This commit is contained in:
Joseph Schorr 2013-11-05 16:15:09 -05:00
commit a3970fa75c
4 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
data/model.py
View file

@ -112,9 +112,17 @@ def create_team(name, org, team_role_name, description=''):
description=description)
def remove_team(name, org):
# TODO: have code to remove the team, and all its repo permissions, etc.
pass
def remove_team(org_name, team_name):
found = list(Team.select().join(User).where(User.organization == True,
User.username == org_name,
Team.name == team_name))
if not found:
raise InvalidTeamException('Team named: %s is not a team in org: %s' %
(team_name, org_name))
team = found[0]
team.delete_instance(recursive=True, delete_nullable=True)
def add_user_to_team(user, team):
return TeamMember.create(user=user, team=team)
@ -207,7 +215,7 @@ def validate_reset_code(code):
def get_user(username):
try:
return User.get(User.username == username)
return User.get(User.username == username, User.organization == False)
except User.DoesNotExist:
return None

6
endpoints/api.py
View file

@ -346,9 +346,9 @@ def update_organization_team(orgname, teamname):
@app.route('/api/organization/<orgname>/team/<teamname>',
methods=['DELETE'])
def delete_organization_team(orgname, teamname):
edit_permission = AdministerOrganizationPermission(orgname)
if edit_permission.can():
model.remove_team(teamname, orgname)
permission = AdministerOrganizationPermission(orgname)
if permission.can():
model.remove_team(orgname, teamname)
return make_response('Deleted', 204)
abort(403)

1
static/css/quay.css
View file

@ -1418,7 +1418,6 @@ p.editable:hover i {
.org-view .header-col {
color: #444;
padding-left: 30px;
}
.org-view .header-col dd {

14
static/partials/org-view.html
View file

@ -11,9 +11,8 @@
<button class="btn btn-success"><i class="fa fa-group"></i> Create Team</button>
</div>
<div class="row visible-md visible-lg">
<div class="col-md-7"></div>
<div class="col-md-3 header-col" ng-show="organization.is_admin">
<div class="row hidden-xs">
<div class="col-md-4 col-md-offset-8 col-sm-5 col-sm-offset-7 header-col" ng-show="organization.is_admin">
Team Permissions
<i class="info-icon fa fa-info-circle" data-placement="bottom" data-original-title="" title=""
data-content="Global permissions for the team and its members<br><br><dl><dt>Member</dt><dd>Permissions are assigned on a per repository basis</dd><dt>Creator</dt><dd>A team can create its own repositories</dd><dt>Admin</dt><dd>A team has full control of the organization</dd></dl>"></i>
@ -22,7 +21,7 @@
<div class="team-listing" ng-repeat="(name, team) in organization.teams">
<div class="row">
<div class="col-md-7">
<div class="col-sm-7 col-md-8">
<div class="team-title">
<i class="fa fa-group"></i>
<span ng-show="team.can_view">
@ -36,12 +35,9 @@
<div class="team-description markdown-view" content="team.description" first-line-only="true"></div>
</div>
<div class="col-md-3 control-col" ng-show="organization.is_admin">
<div class="col-sm-5 col-md-4 control-col" ng-show="organization.is_admin">
<span class="role-group" current-role="team.role" role-changed="setRole(role, team.name)" roles="teamRoles"></span>
</div>
<div class="col-md-1 control-col delete-col" ng-show="organization.is_admin">
<button class="btn btn-danger" ng-click="askDeleteTeam(team.name)">Delete Team</button>
<button class="btn btn-sm btn-danger" ng-click="askDeleteTeam(team.name)">Delete Team</button>
</div>
</div>
</div>