From 39ca38837ec97697deaa7abb24dbb4d425ecbdea Mon Sep 17 00:00:00 2001
From: Umair Khan <umair.waheed@gmail.com>
Date: Wed, 1 Nov 2017 13:01:38 +0500
Subject: [PATCH] user-groups: Add description to groups.

---
 zerver/lib/user_groups.py                     |  7 ++++---
 .../migrations/0117_add_desc_to_user_group.py | 20 +++++++++++++++++++
 zerver/models.py                              |  1 +
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 zerver/migrations/0117_add_desc_to_user_group.py

diff --git a/zerver/lib/user_groups.py b/zerver/lib/user_groups.py
index 813574ca14..3ef1906ffb 100644
--- a/zerver/lib/user_groups.py
+++ b/zerver/lib/user_groups.py
@@ -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
diff --git a/zerver/migrations/0117_add_desc_to_user_group.py b/zerver/migrations/0117_add_desc_to_user_group.py
new file mode 100644
index 0000000000..24564849fa
--- /dev/null
+++ b/zerver/migrations/0117_add_desc_to_user_group.py
@@ -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),
+        ),
+    ]
diff --git a/zerver/models.py b/zerver/models.py
index 06a7bb8510..9c693ece12 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -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'),)