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

New layout cleanup: Remove second GH trigger path

Browse source
This commit is contained in:
Joseph Schorr 2015-06-29 12:18:21 +03:00
parent 4ec2143d47
commit 33039e9bc4
2 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
endpoints/githubtrigger.py
View file

@ -18,7 +18,6 @@ client = app.config['HTTPCLIENT']
githubtrigger = Blueprint('callback', __name__) githubtrigger = Blueprint('callback', __name__)
@githubtrigger.route('/github/callback/trigger/<path:repository>', methods=['GET']) @githubtrigger.route('/github/callback/trigger/<path:repository>', methods=['GET'])
@githubtrigger.route('/github/callback/trigger/<path:repository>/__new', methods=['GET'])
@route_show_if(features.GITHUB_BUILD) @route_show_if(features.GITHUB_BUILD)
@require_session_login @require_session_login
@parse_repository_name @parse_repository_name
@ -33,18 +32,10 @@ def attach_github_build_trigger(namespace, repository):
abort(404, message=msg) abort(404, message=msg)
trigger = model.create_build_trigger(repo, 'github', token, current_user.db_user()) trigger = model.create_build_trigger(repo, 'github', token, current_user.db_user())
repo_path = '%s/%s' % (namespace, repository)
# TODO(jschorr): Remove once the new layout is in place. full_url = '%s%s%s' % (url_for('web.repository', path=repo_path), '?tab=builds&newtrigger=',
admin_path = '%s/%s/%s' % (namespace, repository, 'admin')
full_url = '%s%s%s' % (url_for('web.repository', path=admin_path), '?tab=trigger&new_trigger=',
trigger.uuid) trigger.uuid)
if '__new' in request.url:
repo_path = '%s/%s' % (namespace, repository)
full_url = '%s%s%s' % (url_for('web.repository', path=repo_path), '?tab=builds&newtrigger=',
trigger.uuid)
logger.debug('Redirecting to full url: %s', full_url) logger.debug('Redirecting to full url: %s', full_url)
return redirect(full_url) return redirect(full_url)

4
static/js/services/trigger-service.js
View file

@ -23,10 +23,6 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' + var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' +
namespace + '/' + repository; namespace + '/' + repository;
if (Config.isNewLayout()) {
redirect_uri += '/__new';
}
var authorize_url = KeyService['githubTriggerAuthorizeUrl']; var authorize_url = KeyService['githubTriggerAuthorizeUrl'];
var client_id = KeyService['githubTriggerClientId']; var client_id = KeyService['githubTriggerClientId'];