diff -r 3a50bdfb75a9 -r ba3309b2fd30 app/soc/models/group.py --- a/app/soc/models/group.py Fri Nov 21 08:38:53 2008 +0000 +++ b/app/soc/models/group.py Fri Nov 21 08:41:23 2008 +0000 @@ -22,18 +22,17 @@ ] -import polymodel - from google.appengine.ext import db from django.utils.translation import ugettext_lazy from soc.models import countries +import soc.models.linkable import soc.models.user -class Group(polymodel.PolyModel): +class Group(soc.models.linkable.Linkable): """Common data fields for all groups. """ @@ -42,14 +41,6 @@ verbose_name=ugettext_lazy('Name')) name.help_text = ugettext_lazy('Complete, formal name of the group.') - #: Required field storing link_id used in URLs to identify group. - #: Lower ASCII characters only. - link_id = db.StringProperty(required=True, - verbose_name=ugettext_lazy('Link ID')) - link_id.help_text = ugettext_lazy( - 'Field used in URLs to identify group. ' - 'Lower ASCII characters only.') - #: Required field storing short name of the group. #: It can be used for displaying group as sidebar menu item. short_name = db.StringProperty(required=True,