# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1228597517 0
# Node ID 125cad9596daac5e57235017f8ec9e110c0cfd15
# Parent  4755caf1d7a688075e52d282a7314dfc2a8a7855
Changed generic_name to group_label in models/program.py.

Also I've updated the comments and help text to explain the meaning of this field.

Patch by: Lennard de Rijk

diff -r 4755caf1d7a6 -r 125cad9596da app/soc/models/program.py
--- a/app/soc/models/program.py	Sat Dec 06 19:25:01 2008 +0000
+++ b/app/soc/models/program.py	Sat Dec 06 21:05:17 2008 +0000
@@ -43,11 +43,13 @@
       verbose_name=ugettext_lazy('Short name'))
   short_name.help_text = ugettext_lazy('Short name used for sidebar menu')
 
-  #: Required field storing short name of the group.
-  #: It can be used for displaying group as sidebar menu item.
-  generic_name = db.StringProperty(required=True,
-      verbose_name=ugettext_lazy('Generic name'))
-  generic_name.help_text = ugettext_lazy('Generic Name used to group')
+  #: Optional field used to relate it to other programs
+  #: For example, GSoC would be a group label for GSoC2008/GSoC2009
+  group_label = db.StringProperty(
+      verbose_name=ugettext_lazy('Group label'))
+  group_label.help_text = ugettext_lazy(
+      'Optional name used to relate this program to others. '
+      'For example, GSoC would be a group label for GSoC 2008 and GSoC 2009.')
 
   #: Required field storing description of the group.
   description = db.TextProperty(required=True,
diff -r 4755caf1d7a6 -r 125cad9596da app/soc/templates/soc/program/public.html
--- a/app/soc/templates/soc/program/public.html	Sat Dec 06 19:25:01 2008 +0000
+++ b/app/soc/templates/soc/program/public.html	Sat Dec 06 21:05:17 2008 +0000
@@ -25,7 +25,7 @@
   {% readonly_field_as_table_row entity.fields.scope_path.label entity.scope_path %}
   {% readonly_field_as_table_row entity.fields.name.label entity.name %}
   {% readonly_field_as_table_row entity.fields.short_name.label entity.short_name %}
-  {% readonly_field_as_table_row entity.fields.generic_name.label entity.generic_name %}
+  {% readonly_field_as_table_row entity.fields.group_label.label entity.group_label %}
   <!-- TODO(pawel.solyga) make this generic -->
  </table>
 </p>