From a348352c04afeaa0f816afb95e05db7a2ed4f12b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 30 2014 15:56:51 +0000 Subject: Update the git for tickets upon creation, edition or addition of new comments --- diff --git a/progit/issues.py b/progit/issues.py index 56bf8b4..5fb177c 100644 --- a/progit/issues.py +++ b/progit/issues.py @@ -57,6 +57,7 @@ def add_comment_issue(repo, issueid, username=None): issue=issue, comment=comment, user=flask.g.fas_user.username, + ticketfolder=APP.config['TICKETS_FOLDER'], ) SESSION.commit() flask.flash(message) @@ -125,6 +126,7 @@ def new_issue(repo, username=None): title=title, content=content, user=flask.g.fas_user.username, + ticketfolder=APP.config['TICKETS_FOLDER'], ) SESSION.commit() flask.flash(message) @@ -178,6 +180,7 @@ def view_issue(repo, issueid, username=None): SESSION, issue=issue, status=form.status.data, + ticketfolder=APP.config['TICKETS_FOLDER'], ) SESSION.commit() flask.flash(message) @@ -240,6 +243,7 @@ def edit_issue(repo, issueid, username=None): title=title, content=content, status=status, + ticketfolder=APP.config['TICKETS_FOLDER'], ) SESSION.commit() flask.flash(message) diff --git a/progit/lib.py b/progit/lib.py index ab20bad..5685d47 100644 --- a/progit/lib.py +++ b/progit/lib.py @@ -74,7 +74,7 @@ def get_all_users(session): return users -def add_issue_comment(session, issue, comment, user): +def add_issue_comment(session, issue, comment, user, ticketfolder): ''' Add a comment to an issue. ''' user_obj = get_user(session, user) if not user_obj: @@ -94,6 +94,8 @@ def add_issue_comment(session, issue, comment, user): # Make sure we won't have SQLAlchemy error before we create the repo session.flush() + update_git_ticket(issue, repo=issue.project, ticketfolder=ticketfolder) + return 'Comment added' @@ -157,7 +159,7 @@ def new_project(session, user, name, gitfolder, docfolder, ticketfolder, return 'Project "%s" created' % name -def new_issue(session, repo, title, content, user): +def new_issue(session, repo, title, content, user, ticketfolder): ''' Create a new issue for the specified repo. ''' user_obj = get_user(session, user) @@ -184,6 +186,8 @@ def new_issue(session, repo, title, content, user): session.add(global_id) session.flush() + update_git_ticket(issue, repo=repo, ticketfolder=ticketfolder) + return 'Issue created' @@ -220,7 +224,8 @@ def new_pull_request( return 'Request created' -def edit_issue(session, issue, title=None, content=None, status=None): +def edit_issue(session, issue, ticketfolder, + title=None, content=None, status=None): ''' Edit the specified issue. ''' edit = [] @@ -234,6 +239,8 @@ def edit_issue(session, issue, title=None, content=None, status=None): issue.status = status edit.append('status') + update_git_ticket(issue, repo=repo, ticketfolder=ticketfolder) + if not edit: return 'No changes to edit' else: