From 4451bc7c01475ca3a44ca4d37f25520b1faf24ff Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Aug 11 2016 13:33:49 +0000
Subject: Specify display name and description when creating a group


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 8b1be61..73a0ad5 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -2537,7 +2537,9 @@ def delete_user_of_group(session, username, groupname, user, is_admin,
     session.flush()
 
 
-def add_group(session, group_name, group_type, user, is_admin, blacklist):
+def add_group(
+        session, group_name, display_name, description,
+        group_type, user, is_admin, blacklist):
     ''' Creates a new group with the given information.
     '''
     if ' ' in group_name:
@@ -2576,6 +2578,8 @@ def add_group(session, group_name, group_type, user, is_admin, blacklist):
 
     grp = pagure.lib.model.PagureGroup(
         group_name=group_name,
+        display_name=display_name,
+        description=description,
         group_type=group_type,
         user_id=user.id,
     )
diff --git a/pagure/templates/add_group.html b/pagure/templates/add_group.html
index 11fe7c1..73bd161 100644
--- a/pagure/templates/add_group.html
+++ b/pagure/templates/add_group.html
@@ -14,6 +14,8 @@
 
     <table>
       {{ render_field_in_row(form.group_name) }}
+      {{ render_field_in_row(form.display_name) }}
+      {{ render_field_in_row(form.description) }}
       {%- if admin %}
       {{ render_field_in_row(form.group_type) }}
       {%- endif %}
diff --git a/pagure/ui/groups.py b/pagure/ui/groups.py
index e98e844..a1183ca 100644
--- a/pagure/ui/groups.py
+++ b/pagure/ui/groups.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- (c) 2015 - Copyright Red Hat Inc
+ (c) 2015-2016 - Copyright Red Hat Inc
 
  Authors:
    Pierre-Yves Chibon <pingou@pingoured.fr>
@@ -234,10 +234,15 @@ def add_group():
     if form.validate_on_submit():
 
         try:
-            group_name = form.group_name.data
+            group_name = form.group_name.data.strip()
+            display_name=form.display_name.data.strip()
+            description=form.description.data.strip()
+
             msg = pagure.lib.add_group(
                 session=pagure.SESSION,
                 group_name=group_name,
+                display_name=display_name,
+                description=description,
                 group_type=form.group_type.data,
                 user=flask.g.fas_user.username,
                 is_admin=pagure.is_admin(),