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

Fix annotations clashing with Stream model fields.

Browse Source
This commit is contained in:
Eklavya Sharma
2016-06-13 13:44:33 +05:30
parent 1ec7e124c7
commit 6f5ed6e7c9
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/digest.py
View File

@@ -114,21 +114,21 @@ def gather_new_users(user_profile, threshold):
return len(user_names), user_names return len(user_names), user_names
def gather_new_streams(user_profile, threshold): def gather_new_streams(user_profile, threshold):
# type: (UserProfile, datetime.datetime) -> Tuple[int, Dict[str, List[str]]] # type: (UserProfile, datetime.datetime) -> Tuple[int, Dict[str, List[text_type]]]
if user_profile.realm.domain == "mit.edu": if user_profile.realm.domain == "mit.edu":
new_streams = [] # type: List[Stream] new_streams = [] # type: List[Stream]
else: else:
new_streams = list(get_active_streams(user_profile.realm).filter( new_streams = list(get_active_streams(user_profile.realm).filter(
invite_only=False, date_created__gt=threshold)) invite_only=False, date_created__gt=threshold))
base_url = "https://%s/#narrow/stream/" % (settings.EXTERNAL_HOST,) base_url = u"https://%s/#narrow/stream/" % (settings.EXTERNAL_HOST,)
streams_html = [] streams_html = []
streams_plain = [] streams_plain = []
for stream in new_streams: for stream in new_streams:
narrow_url = base_url + hashchange_encode(stream.name) narrow_url = base_url + hashchange_encode(stream.name)
stream_link = "<a href='%s'>%s</a>" % (narrow_url, stream.name) stream_link = u"<a href='%s'>%s</a>" % (narrow_url, stream.name)
streams_html.append(stream_link) streams_html.append(stream_link)
streams_plain.append(stream.name) streams_plain.append(stream.name)

2
zerver/lib/test_helpers.py
View File

@@ -379,7 +379,7 @@ class AuthedTestCase(TestCase):
# Subscribe to a stream directly # Subscribe to a stream directly
def subscribe_to_stream(self, email, stream_name, realm=None): def subscribe_to_stream(self, email, stream_name, realm=None):
# type: (str, str, Optional[Realm]) -> None # type: (text_type, text_type, Optional[Realm]) -> None
if realm is None: if realm is None:
realm = get_realm(resolve_email_to_domain(email)) realm = get_realm(resolve_email_to_domain(email))
stream = get_stream(stream_name, realm) stream = get_stream(stream_name, realm)

2
zerver/tests/test_subs.py
View File

@@ -461,7 +461,7 @@ class StreamAdminTest(AuthedTestCase):
class DefaultStreamTest(AuthedTestCase): class DefaultStreamTest(AuthedTestCase):
def get_default_stream_names(self, realm): def get_default_stream_names(self, realm):
# type: (Realm) -> Set[str] # type: (Realm) -> Set[text_type]
streams = get_default_streams_for_realm(realm) streams = get_default_streams_for_realm(realm)
stream_names = [s.name for s in streams] stream_names = [s.name for s in streams]
return set(stream_names) return set(stream_names)

2
zerver/views/__init__.py
View File

@@ -737,7 +737,7 @@ def home(request):
request._email = request.user.email request._email = request.user.email
request.client = get_client("website") request.client = get_client("website")
narrow = [] # type: List[List[str]] narrow = [] # type: List[List[text_type]]
narrow_stream = None narrow_stream = None
narrow_topic = request.GET.get("topic") narrow_topic = request.GET.get("topic")
if request.GET.get("stream"): if request.GET.get("stream"):