diff --git a/progit/app.py b/progit/app.py index 0f68f27..9fbe7eb 100644 --- a/progit/app.py +++ b/progit/app.py @@ -610,13 +610,14 @@ def merge_request_pull(repo, requestid, username=None): if not request: flask.abort(404, 'Pull-request not found') - error_output = flask.url_for( 'request_pull', repo=repo.name, requestid=requestid) if username: error_output = flask.url_for( - 'fork_request_pull', repo=repo.name, requestid=requestid, - username=username) + 'fork_request_pull', + repo=repo.name, + requestid=requestid, + username=username) # Get the fork repopath = os.path.join( diff --git a/progit/doc_utils.py b/progit/doc_utils.py index 08f6d78..893b368 100644 --- a/progit/doc_utils.py +++ b/progit/doc_utils.py @@ -77,7 +77,7 @@ def convert_readme(content, ext): ''' output = content if ext and ext in ['.rst']: - output= convert_doc(unicode(content)) + output = convert_doc(unicode(content)) elif ext and ext in ['.mk']: output = markdown.markdown(content) return output diff --git a/progit/fork.py b/progit/fork.py index 90506ca..51f98c5 100644 --- a/progit/fork.py +++ b/progit/fork.py @@ -45,12 +45,13 @@ def fork_project(repo, username=None): fork_folder=APP.config['FORK_FOLDER'], user=flask.g.fas_user.username) - SESSION.commit() flask.flash(message) return flask.redirect( - flask.url_for('view_fork_repo', - username=flask.g.fas_user.username, repo=repo.name) + flask.url_for( + 'view_fork_repo', + username=flask.g.fas_user.username, + repo=repo.name) ) except progit.exceptions.ProgitException, err: flask.flash(str(err), 'error') @@ -58,7 +59,7 @@ def fork_project(repo, username=None): SESSION.rollback() flask.flash(str(err), 'error') - return flask.redirect(flask.url_for('view_repo',repo=repo.name)) + return flask.redirect(flask.url_for('view_repo', repo=repo.name)) @APP.route('/fork///request-pull/new', diff --git a/progit/urls.py b/progit/urls.py index 36a5e5f..1e2a8d6 100644 --- a/progit/urls.py +++ b/progit/urls.py @@ -41,8 +41,15 @@ def index(): limit = APP.config['ITEM_PER_PAGE'] start = limit * (page - 1) - repos = progit.lib.list_projects(SESSION, fork=False, start=start, limit=limit) - num_repos = progit.lib.list_projects(SESSION, fork=False, count=True) + repos = progit.lib.list_projects( + SESSION, + fork=False, + start=start, + limit=limit) + num_repos = progit.lib.list_projects( + SESSION, + fork=False, + count=True) total_page = int(ceil(num_repos / float(limit))) @@ -350,14 +357,14 @@ def fork_request_pulls(username, repo): def request_pull(repo, requestid): """ Request pulling the changes from the fork into the project. """ - return progit.app.request_pull(repo, requestid=requestid) + return progit.app.request_pull(repo, requestid) @APP.route('/fork///request-pull/') def fork_request_pull(username, repo, requestid): """ Request pulling the changes from the fork into the project. """ - return progit.app.request_pull(repo, requestid=requestid, username=username) + return progit.app.request_pull(repo, requestid, username=username) @APP.route('//request-pull/merge/')