From 45aebf685f3e65a31da33065d779a4f75f28a58e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 11 2016 18:25:17 +0000 Subject: Add missing namespace arguments and fix typos pointed out by @vivekanand1101 --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 0385806..70fc946 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -1283,6 +1283,7 @@ def fork_edit_file( return flask.redirect(flask.url_for( 'edit_file', username=flask.g.fas_user.username, + namespace=repo.namespace, repo=repo.name, branchname=branchname, filename=filename diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index eadb675..d538d60 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -71,7 +71,8 @@ def update_issue(repo, issueid, username=None, namespace=None): if not is_js: flask.flash('Invalid method: GET', 'error') return flask.redirect(flask.url_for( - 'view_issue', username=username, repo=repo.name, issueid=issueid)) + 'view_issue', username=username, repo=repo.name, + namespace=repo.namespace, issueid=issueid)) if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -135,7 +136,7 @@ def update_issue(repo, issueid, username=None, namespace=None): else: return flask.redirect(flask.url_for( 'view_issue', username=username, repo=repo.name, - issueid=issueid)) + namespace=repo.namespace, issueid=issueid)) comment = form.comment.data depends = [] @@ -330,7 +331,8 @@ def edit_tag(repo, tag, username=None, namespace=None): flask.flash('Could not edit tag: %s' % tag, 'error') return flask.redirect(flask.url_for( - '.view_settings', repo=repo.name, username=username)) + '.view_settings', repo=repo.name, username=username, + namespace=repo.namespace)) return flask.render_template( 'edit_tag.html', @@ -381,8 +383,9 @@ def remove_tag(repo, username=None, namespace=None): flask.flash( 'Could not remove tag: %s' % ','.join(tags), 'error') - return flask.redirect( - flask.url_for('.view_settings', repo=repo.name, username=username) + return flask.redirect(flask.url_for( + '.view_settings', repo=repo.name, username=username, + namespace=repo.namespace) ) @@ -788,7 +791,8 @@ def delete_issue(repo, issueid, username=None, namespace=None): flask.flash('Could not delete the issue', 'error') return flask.redirect(flask.url_for( - 'view_issue', username=username, repo=repo.name, issueid=issueid)) + 'view_issue', username=username, repo=repo.name, + namespace=repo.namespace, issueid=issueid)) @APP.route('//issue//edit/', methods=('GET', 'POST')) @@ -871,6 +875,7 @@ def edit_issue(repo, issueid, username=None, namespace=None): filelocation = flask.url_for( 'view_issue_raw_file', repo=repo.name, + namespace=repo.namespace, username=username, filename=new_filename, ) @@ -955,6 +960,7 @@ def upload_issue(repo, issueid, username=None, namespace=None): 'view_issue_raw_file', repo=repo.name, username=username, + namespace=repo.namespace, filename=new_filename, ) }) diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index cd45408..04f5c94 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -53,7 +53,7 @@ from pagure import (APP, SESSION, LOG, __get_file_in_tree, login_required, @APP.route('/.git') @APP.route('//.git') -@APP.route('/fork///.git') +@APP.route('/fork//.git') @APP.route('/fork///.git') def view_repo_git(repo, username=None, namespace=None): ''' Redirect to the project index page when user wants to view @@ -240,6 +240,7 @@ def view_repo_branch(repo, branchname, username=None, namespace=None): content, ext, view_file_url=flask.url_for( 'view_raw_file', username=username, + namespace=repo.namespace, repo=repo.name, identifier=branchname, filename='')) return flask.render_template( @@ -896,8 +897,9 @@ def new_release(repo, username=None, namespace=None): except Exception as err: # pragma: no cover APP.logger.exception(err) flask.flash('Upload failed', 'error') - return flask.redirect( - flask.url_for('view_tags', repo=repo.name, username=username)) + return flask.redirect(flask.url_for( + 'view_tags', repo=repo.name, username=username, + namespace=repo.namespace)) return flask.render_template( 'new_release.html', @@ -963,7 +965,8 @@ def view_settings(repo, username=None, namespace=None): SESSION.commit() flask.flash(message) return flask.redirect(flask.url_for( - 'view_repo', username=username, repo=repo.name)) + 'view_repo', username=username, repo=repo.name, + namespace=repo.namespace)) except pagure.exceptions.PagureException as msg: SESSION.rollback() flask.flash(msg, 'error') @@ -1037,7 +1040,8 @@ def update_project(repo, username=None, namespace=None): flask.flash(str(err), 'error') return flask.redirect(flask.url_for( - 'view_settings', username=username, repo=repo.name)) + 'view_settings', username=username, repo=repo.name, + namespace=repo.namespace)) @APP.route('//update/priorities', methods=['POST']) @@ -1130,7 +1134,8 @@ def update_priorities(repo, username=None, namespace=None): flask.flash(str(err), 'error') return flask.redirect(flask.url_for( - 'view_settings', username=username, repo=repo.name)) + 'view_settings', username=username, repo=repo.name. + namespace=repo.namespace)) @APP.route('//update/milestones', methods=['POST']) @@ -1403,9 +1408,9 @@ def remove_user(repo, userid, username=None, namespace=None): if str(userid) not in userids: flask.flash( 'User does not have commit or cannot loose it right', 'error') - return flask.redirect( - flask.url_for( - '.view_settings', repo=repo.name, username=username) + return flask.redirect(flask.url_for( + '.view_settings', repo=repo.name, username=username, + namespace=repo.namespace,) ) for user in repo.users: @@ -1912,11 +1917,7 @@ def delete_branch(repo, branchname, username=None, namespace=None): def view_docs(repo, username=None, filename=None, namespace=None): """ Display the documentation """ - repo_obj = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) - - if not repo_obj: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not APP.config.get('DOC_APP_URL'): flask.abort(404, 'This pagure instance has no doc server') @@ -1924,7 +1925,7 @@ def view_docs(repo, username=None, filename=None, namespace=None): return flask.render_template( 'docs.html', select='docs', - repo=repo_obj, + repo=repo, username=username, filename=filename, endpoint='view_docs', @@ -1942,15 +1943,11 @@ def view_project_activity(repo, namespace=None): if not APP.config.get('DATAGREPPER_URL'): flask.abort(404) - repo_obj = pagure.lib.get_project( - SESSION, repo, user=None, namespace=namespace) - - if not repo_obj: - flask.abort(404, 'Project not found') + repo = flask.g.repo return flask.render_template( 'activity.html', - repo=repo_obj, + repo=repo, )