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

Fix the call that determines if an organization has enough private repositories.

Browse source
This commit is contained in:
yackob03 2013-11-05 14:55:05 -05:00
parent ac72a8d86d
commit 296695cb87
2 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/model.py
View file

@ -269,7 +269,7 @@ def get_user_organizations(username):
def get_organization(name): def get_organization(name):
try: try:
return User.get(username = name, organization = True) return User.get(username=name, organization=True)
except User.DoesNotExist: except User.DoesNotExist:
raise InvalidOrganizationException('Organization does not exist: %s' % raise InvalidOrganizationException('Organization does not exist: %s' %
name) name)

38
endpoints/api.py
View file

@ -285,30 +285,26 @@ def get_organization(orgname):
@app.route('/api/organization/<orgname>/private', methods=['GET']) @app.route('/api/organization/<orgname>/private', methods=['GET'])
def get_organization_private_allowed(orgname): def get_organization_private_allowed(orgname):
if current_user.is_anonymous(): permission = CreateRepositoryPermission(orgname)
abort(404) if permission.can():
organization = model.get_organization(orgname)
user = current_user.db_user() private_repos = model.get_private_repo_count(organization.username)
if organization.stripe_id:
cus = stripe.Customer.retrieve(organization.stripe_id)
try: if cus.subscription:
organization = model.get_organization(orgname, username = user.username) repos_allowed = get_plan(cus.subscription.plan.id)
except: return jsonify({
abort(404) 'privateAllowed': (private_repos < repos_allowed)
})
return jsonify({
'privateAllowed': False
})
private_repos = model.get_private_repo_count(organization.username) abort(403)
if organization.stripe_id:
cus = stripe.Customer.retrieve(organization.stripe_id)
if cus.subscription:
repos_allowed = get_plan(cus.subscription.plan.id)
return jsonify({
'privateAllowed': (private_repos < repos_allowed)
})
return jsonify({
'privateAllowed': False
})
def member_view(m): def member_view(m):