From b46f3d8cd1e71f6b2a47f2b567bc68c65187bf83 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: May 25 2016 21:05:27 +0000 Subject: Added notify argument (default to True) to add_issue_assignee Modified update_ticket_from_git to set add_issue_assignee notify to False --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 19e1afb..8b227cc 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -327,7 +327,8 @@ def add_tag_obj(session, obj, tags, user, ticketfolder): return 'Nothing to add' -def add_issue_assignee(session, issue, assignee, user, ticketfolder): +def add_issue_assignee(session, issue, assignee, user, ticketfolder, + notify=True): ''' Add an assignee to an issue, in other words, assigned an issue. ''' user_obj = __get_user(session, user) @@ -338,25 +339,26 @@ def add_issue_assignee(session, issue, assignee, user, ticketfolder): pagure.lib.git.update_git( issue, repo=issue.project, repofolder=ticketfolder) - pagure.lib.notify.notify_assigned_issue(issue, None, user_obj) - if not issue.private: - pagure.lib.notify.log( - issue.project, - topic='issue.assigned.reset', - msg=dict( - issue=issue.to_json(public=True), - project=issue.project.to_json(public=True), - agent=user_obj.username, - ), - redis=REDIS, - ) + if notify: + pagure.lib.notify.notify_assigned_issue(issue, None, user_obj) + if not issue.private: + pagure.lib.notify.log( + issue.project, + topic='issue.assigned.reset', + msg=dict( + issue=issue.to_json(public=True), + project=issue.project.to_json(public=True), + agent=user_obj.username, + ), + redis=REDIS, + ) - # Send notification for the event-source server - if REDIS: - REDIS.publish('pagure.%s' % issue.uid, json.dumps( - {'unassigned': '-'})) + # Send notification for the event-source server + if REDIS: + REDIS.publish('pagure.%s' % issue.uid, json.dumps( + {'unassigned': '-'})) - return 'Assignee reset' + return 'Assignee reset' elif assignee is None and issue.assignee is None: return diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 43e3c46..6a722a0 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -472,7 +472,7 @@ def update_ticket_from_git( if assignee: pagure.lib.add_issue_assignee( session, issue, assignee.username, - user=user.user, ticketfolder=None) + user=user.user, ticketfolder=None, notify=False) # Update depends depends = json_data.get('depends', [])