Fix a problem with initdb and add a limit to the builds API.
This commit is contained in:
parent
5f0969778e
commit
fde96c736a
4 changed files with 14 additions and 16 deletions
|
@ -1105,7 +1105,7 @@ def get_repo(namespace, repository):
|
|||
tag_dict = {tag.name: tag_view(tag) for tag in tags}
|
||||
can_write = ModifyRepositoryPermission(namespace, repository).can()
|
||||
can_admin = AdministerRepositoryPermission(namespace, repository).can()
|
||||
active_builds = model.list_repository_builds(namespace, repository,
|
||||
active_builds = model.list_repository_builds(namespace, repository, 1,
|
||||
include_inactive=False)
|
||||
|
||||
return jsonify({
|
||||
|
@ -1160,9 +1160,11 @@ def build_status_view(build_obj, can_write=False):
|
|||
def get_repo_builds(namespace, repository):
|
||||
permission = ReadRepositoryPermission(namespace, repository)
|
||||
is_public = model.repository_is_public(namespace, repository)
|
||||
if permission.can() or is_public:
|
||||
if permission.can() or is_public:
|
||||
limit = request.args.get('limit', 5)
|
||||
builds = list(model.list_repository_builds(namespace, repository, limit))
|
||||
|
||||
can_write = ModifyRepositoryPermission(namespace, repository).can()
|
||||
builds = model.list_repository_builds(namespace, repository)
|
||||
return jsonify({
|
||||
'builds': [build_status_view(build, can_write) for build in builds]
|
||||
})
|
||||
|
@ -1501,8 +1503,8 @@ def list_trigger_recent_builds(namespace, repository, trigger_uuid):
|
|||
permission = AdministerRepositoryPermission(namespace, repository)
|
||||
if permission.can():
|
||||
limit = request.args.get('limit', 5)
|
||||
builds = model.list_trigger_builds(namespace, repository, trigger_uuid,
|
||||
limit)
|
||||
builds = list(model.list_trigger_builds(namespace, repository,
|
||||
trigger_uuid, limit))
|
||||
return jsonify({
|
||||
'builds': [build_status_view(build, True) for build in builds]
|
||||
})
|
||||
|
|
Reference in a new issue