paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

views/realm_aliases.py: Use domain instead of id as handle for RealmAlias.

Browse Source 
We need to make the change for the API, and the next commit introduces a
unique_together constraint on (realm, domain) anyway.
This commit is contained in:
Harshit Bansal
2017-01-21 00:09:27 -08:00
committed by Tim Abbott
parent 06cc306d00
commit b4186fdfdd
10 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zerver/lib/actions.py
View File

@@ -3321,7 +3321,7 @@ def apply_events(state, events, user_profile):
if event['op'] == 'add':
state['realm_domains'].append(event['alias'])
elif event['op'] == 'remove':
state['realm_domains'] = [alias for alias in state['realm_domains'] if alias['id'] != event['alias_id']]
state['realm_domains'] = [alias for alias in state['realm_domains'] if alias['domain'] != event['domain']]
elif event['type'] == "realm_emoji":
state['realm_emoji'] = event['realm_emoji']
elif event['type'] == "alert_words":
@@ -3685,24 +3685,21 @@ def get_emails_from_user_ids(user_ids):
def get_realm_aliases(realm):
# type: (Realm) -> List[Dict[str, Text]]
return list(realm.realmalias_set.values('id', 'domain'))
return list(realm.realmalias_set.values('domain'))
def do_add_realm_alias(realm, domain):
# type: (Realm, Text) -> (RealmAlias)
alias = RealmAlias(realm=realm, domain=domain)
alias.full_clean()
alias.save()
alias = RealmAlias.objects.create(realm=realm, domain=domain)
event = dict(type="realm_domains", op="add",
alias=dict(id=alias.id,
domain=alias.domain,
alias=dict(domain=alias.domain,
))
send_event(event, active_user_ids(realm))
return alias
def do_remove_realm_alias(realm, alias_id):
# type: (Realm, int) -> None
RealmAlias.objects.get(pk=alias_id).delete()
event = dict(type="realm_domains", op="remove", alias_id=alias_id)
def do_remove_realm_alias(realm, domain):
# type: (Realm, Text) -> None
RealmAlias.objects.get(realm=realm, domain=domain).delete()
event = dict(type="realm_domains", op="remove", domain=domain)
send_event(event, active_user_ids(realm))
def get_occupied_streams(realm):