user-groups: Add description to groups.

This commit is contained in:
Umair Khan 2017-11-01 13:01:38 +05:00 committed by Tim Abbott
parent 18aecb82d7
commit 39ca38837e
3 changed files with 25 additions and 3 deletions

View File

@ -33,10 +33,11 @@ def check_remove_user_from_user_group(user_profile, user_group):
except Exception:
return False
def create_user_group(name, members, realm):
# type: (Text, List[UserProfile], Realm) -> UserGroup
def create_user_group(name, members, realm, description=''):
# type: (Text, List[UserProfile], Realm, Text) -> UserGroup
with transaction.atomic():
user_group = UserGroup.objects.create(name=name, realm=realm)
user_group = UserGroup.objects.create(name=name, realm=realm,
description=description)
UserGroupMembership.objects.bulk_create([
UserGroupMembership(user_profile=member, user_group=user_group)
for member in members

View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2017-11-01 08:01
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('zerver', '0116_realm_allow_message_deleting'),
]
operations = [
migrations.AddField(
model_name='usergroup',
name='description',
field=models.CharField(default='', max_length=1024),
),
]

View File

@ -763,6 +763,7 @@ class UserGroup(models.Model):
name = models.CharField(max_length=100)
members = models.ManyToManyField(UserProfile, through='UserGroupMembership')
realm = models.ForeignKey(Realm)
description = models.CharField(max_length=1024, default=u'') # type: Text
class Meta:
unique_together = (('realm', 'name'),)