Made mailing lists and IRC channel required for group/org applications.
Also fixed some whitespace errors and updated seed_db.
Patch by: Lennard de Rijk
Reviewed by: to-be-reviewed
--- a/app/soc/models/group.py Sat Feb 28 14:29:23 2009 +0000
+++ b/app/soc/models/group.py Sat Feb 28 17:05:53 2009 +0000
@@ -58,17 +58,17 @@
#: Required field storing a home page URL of the group.
home_page = db.LinkProperty(required=True,
verbose_name=ugettext('Home Page URL'))
-
+
#: Required email address used as the "public" contact mechanism for
#: the Group (as opposed to the founder.account email address which is
#: kept secret, revealed only to Developers).
email = db.EmailProperty(required=True,
verbose_name=ugettext('Email'))
-
+
#: Required field storing description of the group.
description = db.TextProperty(required=True,
verbose_name=ugettext('Description'))
-
+
#: Optional public mailing list.
pub_mailing_list = db.StringProperty(required=False,
verbose_name=ugettext('Public Mailing List'))
--- a/app/soc/models/group_app.py Sat Feb 28 14:29:23 2009 +0000
+++ b/app/soc/models/group_app.py Sat Feb 28 17:05:53 2009 +0000
@@ -74,16 +74,19 @@
'Why is your group applying to participate?'
' What do you hope to gain by participating?'))
- pub_mailing_list = db.StringProperty(required=False,
+ pub_mailing_list = db.StringProperty(required=True,
verbose_name=ugettext(
'What is the main public mailing list for your group?'))
pub_mailing_list.help_text = ugettext(
- 'Mailing list email address, URL to sign-up page, etc.')
+ 'Mailing list email address, URL to sign-up page, etc. If a mailing '
+ 'list is not used please specify another method of communication used '
+ 'within the group.')
- irc_channel = db.StringProperty(required=False,
+ irc_channel = db.StringProperty(required=True,
verbose_name=ugettext(
'Where is the main IRC channel for your group?'))
- irc_channel.help_text = ugettext('IRC network and channel.')
+ irc_channel.help_text = ugettext('IRC network and channel. If IRC is '
+ 'not used please write something like not applicable.')
backup_admin = db.ReferenceProperty(reference_class=soc.models.user.User,
required=False, collection_name='group_app_backup_admin',
--- a/app/soc/models/org_app.py Sat Feb 28 14:29:23 2009 +0000
+++ b/app/soc/models/org_app.py Sat Feb 28 17:05:53 2009 +0000
@@ -41,7 +41,7 @@
approach. At that time, existing OrgApplication entities will be migrated
(converted) to their new representations in the Datastore.
"""
-
+
prior_participation = db.TextProperty(required=False, verbose_name=ugettext(
'Has your group participated previously?'
' If so, please summarize your involvement and any past successes'
@@ -50,21 +50,23 @@
prior_application = db.TextProperty(required=False, verbose_name=ugettext(
'If your group has not previously participated, have you applied in'
' the past? If so, for what sort of participation?'))
-
+
license_name = db.StringProperty(required=True, choices=licenses.LICENSES,
verbose_name=ugettext('What license does your organization use?'))
license_name.example_text=ugettext('See '
'<a href="http://www.opensource.org/licenses/alphabetical"> the official list</a>.')
-
+
ideas = db.LinkProperty(required=True, verbose_name=ugettext(
'What is the URL to the ideas list of your organization?'))
ideas.help_text = ugettext('For instance a link to a Melange public '
'document or some other URL')
- dev_mailing_list = db.StringProperty(required=False, verbose_name=ugettext(
+ dev_mailing_list = db.StringProperty(required=True, verbose_name=ugettext(
'What is the main development mailing list for your group?'))
dev_mailing_list.help_text = ugettext(
- 'Mailing list email address, URL to sign-up page, etc.')
+ 'Mailing list email address, URL to sign-up page, etc. If a mailing '
+ 'list is not used please specify another method of communication used '
+ 'within the group.')
contrib_template = db.LinkProperty(required=False, verbose_name=ugettext(
'What is the URL to the application template would you like contributors'
--- a/app/soc/models/seed_db.py Sat Feb 28 14:29:23 2009 +0000
+++ b/app/soc/models/seed_db.py Sat Feb 28 17:05:53 2009 +0000
@@ -182,6 +182,9 @@
'applicant': current_user,
'home_page': 'http://www.google.com',
'email': 'org@example.com',
+ 'irc_channel': '#care',
+ 'pub_mailing_list': 'http://groups.google.com',
+ 'dev_mailing_list': 'http://groups.google.com',
'description': 'This is an awesome org!',
'why_applying': 'Because we can',
'member_criteria': 'They need to be awesome',