UI and code improvements to make working with the multiple SCMs easier

This commit is contained in:
Joseph Schorr 2015-05-03 10:38:11 -07:00
parent f091aaa07e
commit d07f9f04e9
10 changed files with 70 additions and 114 deletions

View file

@ -48,14 +48,19 @@ def user_view(user):
def trigger_view(trigger, can_read=False, can_admin=False):
if trigger and trigger.uuid:
build_trigger = BuildTriggerHandler.get_handler(trigger)
build_source = build_trigger.config.get('build_source')
repo_url = build_trigger.get_repository_url() if build_source else None
return {
'service': trigger.service.name,
'build_source': build_trigger.config.get('build_source') if can_read else None,
'build_source': build_source if can_read else None,
'config': build_trigger.config if can_admin else {},
'id': trigger.uuid,
'connected_user': trigger.connected_user.username,
'is_active': build_trigger.is_active(),
'pull_robot': user_view(trigger.pull_robot) if trigger.pull_robot else None
'pull_robot': user_view(trigger.pull_robot) if trigger.pull_robot else None,
'repository_url': repo_url if can_read else None,
}
return None