paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use get_stream in more places to avoid case-sensitivity errors

Browse Source 
(imported from commit 9b7109d4e23db4359751b0283025b7ff60e06836)
This commit is contained in:
Zev Benjamin
2013-01-14 15:47:17 -05:00
parent 4ffc6a2de1
commit 28a2832415
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zephyr/views.py
View File

@@ -211,10 +211,10 @@ def json_invite_users(request, user_profile, invitee_emails=POST):
streams = [] streams = []
for stream_name in stream_names: for stream_name in stream_names:
try: stream = get_stream(stream_name, user_profile.realm)
streams.append(Stream.objects.get(realm=user_profile.realm, name__iexact=stream_name)) if stream is None:
except Stream.DoesNotExist:
return json_error("Stream does not exist: %s. No invites were sent." % stream_name) return json_error("Stream does not exist: %s. No invites were sent." % stream_name)
streams.append(stream)
new_prereg_users = [] new_prereg_users = []
errors = [] errors = []
@@ -437,10 +437,8 @@ class NarrowBuilder(object):
raise BadNarrowOperator("unknown 'is' operand " + operand) raise BadNarrowOperator("unknown 'is' operand " + operand)
def by_stream(self, operand): def by_stream(self, operand):
try: stream = get_stream(operand, self.user_profile.realm)
stream = Stream.objects.get(realm=self.user_profile.realm, if stream is None:
name__iexact=operand)
except Stream.DoesNotExist:
raise BadNarrowOperator('unknown stream ' + operand) raise BadNarrowOperator('unknown stream ' + operand)
recipient = Recipient.objects.get(type=Recipient.STREAM, type_id=stream.id) recipient = Recipient.objects.get(type=Recipient.STREAM, type_id=stream.id)
return Q(recipient=recipient) return Q(recipient=recipient)
@@ -712,9 +710,8 @@ def send_message_backend(request, user_profile, client,
# if not valid_stream_name(subject_name): # if not valid_stream_name(subject_name):
# return json_error("Invalid subject name") # return json_error("Invalid subject name")
try: stream = get_stream(stream_name, user_profile.realm)
stream = Stream.objects.get(realm=user_profile.realm, name__iexact=stream_name) if stream is None:
except Stream.DoesNotExist:
return json_error("Stream does not exist") return json_error("Stream does not exist")
recipient = Recipient.objects.get(type_id=stream.id, type=Recipient.STREAM) recipient = Recipient.objects.get(type_id=stream.id, type=Recipient.STREAM)
elif message_type_name == 'private': elif message_type_name == 'private':
@@ -903,9 +900,8 @@ def get_subscribers_backend(request, user_profile, stream_name=POST('stream')):
if user_profile.realm.domain == "mit.edu": if user_profile.realm.domain == "mit.edu":
return json_error("You cannot get subscribers in this realm") return json_error("You cannot get subscribers in this realm")
try: stream = get_stream(stream_name, user_profile.realm)
stream = Stream.objects.get(name=stream_name, realm=user_profile.realm) if stream is None:
except Stream.DoesNotExist:
return json_error("Stream does not exist: %s" % stream_name) return json_error("Stream does not exist: %s" % stream_name)
subscriptions = Subscription.objects.filter(recipient__type=Recipient.STREAM, subscriptions = Subscription.objects.filter(recipient__type=Recipient.STREAM,
recipient__type_id=stream.id, recipient__type_id=stream.id,