paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'zephyr' from invalid message type error.

Browse Source 
(imported from commit 360ffc5bfbb12f65af83093ee5a83ac7caa5c464)
This commit is contained in:
Tim Abbott
2012-10-02 18:10:55 -04:00
parent 7acfb5c71c
commit 01bc4aaf28
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zephyr/tests.py
View File

@@ -362,7 +362,7 @@ class ZephyrPOSTTest(AuthedTestCase):
result = self.client.post("/send_message/", {"type": "invalid type", result = self.client.post("/send_message/", {"type": "invalid type",
"content": "Test message", "content": "Test message",
"recipient": "othello@humbughq.com"}) "recipient": "othello@humbughq.com"})
self.assert_json_error(result, "Invalid zephyr type") self.assert_json_error(result, "Invalid message type")
class DummyHandler(object): class DummyHandler(object):
def __init__(self, callback): def __init__(self, callback):

2
zephyr/views.py
View File

@@ -390,7 +390,7 @@ def zephyr_backend(request, user_profile, sender):
recipient = Recipient.objects.get(type_id=recipient_user_profile.id, recipient = Recipient.objects.get(type_id=recipient_user_profile.id,
type=Recipient.PERSONAL) type=Recipient.PERSONAL)
else: else:
return json_error("Invalid zephyr type") return json_error("Invalid message type")
new_zephyr = Zephyr() new_zephyr = Zephyr()
new_zephyr.sender = UserProfile.objects.get(user=sender) new_zephyr.sender = UserProfile.objects.get(user=sender)