Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

webhooks/redmine: Use the journal author for issue edit events.

Niloth Pef283a976d2c
diff --git a/zerver/webhooks/redmine/fixtures/issue_updated.json b/zerver/webhooks/redmine/fixtures/issue_updated.json
index 8768a00c6b1..262b2b63b45 100644
--- a/zerver/webhooks/redmine/fixtures/issue_updated.json
+++ b/zerver/webhooks/redmine/fixtures/issue_updated.json
@@ -59,10 +59,10 @@
"author": {
"icon_url": "http://www.gravatar.com/avatar/example",
"identity_url": null,
- "lastname": "user",
- "firstname": "test",
- "mail": "[email protected]",
- "login": "test",
+ "lastname": "user2",
+ "firstname": "test2",
+ "mail": "[email protected]",
+ "login": "test2",
"id": 3
},
"created_on": "2014-03-01T16:17:48Z",
diff --git a/zerver/webhooks/redmine/tests.py b/zerver/webhooks/redmine/tests.py
index e793742be25..37902e4dd90 100644
--- a/zerver/webhooks/redmine/tests.py
+++ b/zerver/webhooks/redmine/tests.py
@@ -24,7 +24,7 @@ I'm having a problem with this.
self.check_webhook("issue_opened_without_assignee", self.TOPIC_NAME, expected_message)
def test_issue_updated(self) -> None:
- expected_message = """**test user** updated [#191 Found a bug](https://example.com).
+ expected_message = """**test2 user2** updated [#191 Found a bug](https://example.com).
~~~ quote
I've started working on this issue. The problem seems to be in the authentication module.
diff --git a/zerver/webhooks/redmine/view.py b/zerver/webhooks/redmine/view.py
index 9c96510cf64..88a5fd29edf 100644
--- a/zerver/webhooks/redmine/view.py
+++ b/zerver/webhooks/redmine/view.py
@@ -67,8 +67,7 @@ def handle_issue_opened(payload: WildValue) -> str:
def handle_issue_updated(payload: WildValue) -> str:
- issue = payload["issue"]
- author_name = _get_user_name(issue["author"])
+ author_name = _get_user_name(payload["journal"]["author"])
issue_link = _get_issue_link(payload)
journal_notes = ""