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

models: Use Realm.string_id instead of domain in RealmEmoji.__unicode__.

Browse Source
This commit is contained in:
Rishi Gupta
2017-03-13 09:26:26 -07:00
parent a2bfa7793a
commit cc25193faa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/models.py
View File

@@ -383,7 +383,7 @@ class RealmEmoji(ModelReprMixin, models.Model):
def __unicode__(self): def __unicode__(self):
# type: () -> Text # type: () -> Text
return u"<RealmEmoji(%s): %s %s>" % (self.realm.domain, self.name, self.img_url) return u"<RealmEmoji(%s): %s %s>" % (self.realm.string_id, self.name, self.img_url)
def get_realm_emoji_uncached(realm): def get_realm_emoji_uncached(realm):
# type: (Realm) -> Dict[Text, Optional[Dict[str, Text]]] # type: (Realm) -> Dict[Text, Optional[Dict[str, Text]]]

2
zerver/tests/test_realm_emoji.py
View File

@@ -65,7 +65,7 @@ class RealmEmojiTest(ZulipTestCase):
realm_emoji = RealmEmoji.objects.get(realm=get_realm('zulip')) realm_emoji = RealmEmoji.objects.get(realm=get_realm('zulip'))
self.assertEqual( self.assertEqual(
str(realm_emoji), str(realm_emoji),
'<RealmEmoji(zulip.com): my_emoji https://example.com/my_emoji>' '<RealmEmoji(zulip): my_emoji https://example.com/my_emoji>'
) )
def test_upload_exception(self): def test_upload_exception(self):