Fix the call that determines if an organization has enough private repositories.
This commit is contained in:
parent
ac72a8d86d
commit
296695cb87
2 changed files with 18 additions and 22 deletions
|
@ -269,7 +269,7 @@ def get_user_organizations(username):
|
|||
|
||||
def get_organization(name):
|
||||
try:
|
||||
return User.get(username = name, organization = True)
|
||||
return User.get(username=name, organization=True)
|
||||
except User.DoesNotExist:
|
||||
raise InvalidOrganizationException('Organization does not exist: %s' %
|
||||
name)
|
||||
|
|
|
@ -285,30 +285,26 @@ def get_organization(orgname):
|
|||
|
||||
|
||||
@app.route('/api/organization/<orgname>/private', methods=['GET'])
|
||||
def get_organization_private_allowed(orgname):
|
||||
if current_user.is_anonymous():
|
||||
abort(404)
|
||||
def get_organization_private_allowed(orgname):
|
||||
permission = CreateRepositoryPermission(orgname)
|
||||
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:
|
||||
organization = model.get_organization(orgname, username = user.username)
|
||||
except:
|
||||
abort(404)
|
||||
if cus.subscription:
|
||||
repos_allowed = get_plan(cus.subscription.plan.id)
|
||||
return jsonify({
|
||||
'privateAllowed': (private_repos < repos_allowed)
|
||||
})
|
||||
|
||||
return jsonify({
|
||||
'privateAllowed': False
|
||||
})
|
||||
|
||||
private_repos = model.get_private_repo_count(organization.username)
|
||||
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
|
||||
})
|
||||
abort(403)
|
||||
|
||||
|
||||
def member_view(m):
|
||||
|
|
Reference in a new issue