[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 26a9ecdc09c9dee69ea38aaf258bcc01274ede38

[Sylvain Beucler]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".

The branch, master has been updated
       via  26a9ecdc09c9dee69ea38aaf258bcc01274ede38 (commit)
      from  d8b794f3324b89dc0a97a7d5e47127970e717a63 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=26a9ecdc09c9dee69ea38aaf258bcc01274ede38

commit 26a9ecdc09c9dee69ea38aaf258bcc01274ede38
Author: Sylvain Beucler <address@hidden>
Date:   Tue Jul 28 14:14:12 2009 +0200

    Remove forum-related fields (deprecated feature); more admin fixes

diff --git a/migrate_old_savane.sql b/migrate_old_savane.sql
index 479bd45..648959b 100644
--- a/migrate_old_savane.sql
+++ b/migrate_old_savane.sql
@@ -30,11 +30,10 @@ INSERT INTO svmain_groupconfiguration
     (id, name, description, base_host,
      mailing_list_address, mailing_list_virtual_host, mailing_list_format,
      can_use_homepage, can_use_download, can_use_cvs, can_use_arch, 
can_use_svn, can_use_git, can_use_hg,
-     can_use_bzr, can_use_license, can_use_devel_status, can_use_forum, 
can_use_mailing_list,
+     can_use_bzr, can_use_license, can_use_devel_status, can_use_mailing_list,
      can_use_patch, can_use_task, can_use_news, can_use_support, can_use_bug,
      is_menu_configurable_homepage,
      is_menu_configurable_download,
-     is_menu_configurable_forum,
      is_menu_configurable_support,
      is_menu_configurable_mail,
      is_menu_configurable_cvs,
@@ -91,11 +90,10 @@ INSERT INTO svmain_groupconfiguration
   SELECT type_id, name, description, base_host,
       mailing_list_address, mailing_list_virtual_host, mailing_list_format,
       can_use_homepage, can_use_download, can_use_cvs, can_use_arch, 
can_use_svn, can_use_git, can_use_hg,
-      can_use_bzr, can_use_license, can_use_devel_status, can_use_forum, 
can_use_mailing_list,
+      can_use_bzr, can_use_license, can_use_devel_status, can_use_mailing_list,
       can_use_patch, can_use_task, can_use_news, can_use_support, can_use_bug,
       is_menu_configurable_homepage,
       is_menu_configurable_download,
-      is_menu_configurable_forum,
       is_menu_configurable_support,
       is_menu_configurable_mail,
       is_menu_configurable_cvs,
@@ -191,7 +189,6 @@ INSERT INTO svmain_extendedgroup
      use_mail,
      use_patch,
      use_task,
-     use_forum,
      use_cvs,
      use_arch,
      use_svn,
@@ -205,7 +202,6 @@ INSERT INTO svmain_extendedgroup
      use_extralink_documentation,
      url_homepage,
      url_download,
-     url_forum,
      url_support,
      url_mail,
      url_cvs,
@@ -240,7 +236,6 @@ INSERT INTO svmain_extendedgroup
       use_mail,
       use_patch,
       use_task,
-      use_forum,
       use_cvs,
       use_arch,
       use_svn,
@@ -254,7 +249,6 @@ INSERT INTO svmain_extendedgroup
       use_extralink_documentation,
       url_homepage,
       url_download,
-      url_forum,
       url_support,
       url_mail,
       url_cvs,
diff --git a/src/savane/svmain/admin.py b/src/savane/svmain/admin.py
index 198c044..4d79f05 100644
--- a/src/savane/svmain/admin.py
+++ b/src/savane/svmain/admin.py
@@ -62,8 +62,11 @@ class GroupConfigurationAdmin(admin.ModelAdmin):
         (_('Licenses'), {'fields': ('can_use_license',)}),
         (_('Development Status'), {'fields': ('can_use_devel_status',)}),
         (_('Mailing List'),
-         {'fields': ('can_use_mailing_list', 'mailing_list_address',
-                     'mailing_list_virtual_host', 'mailing_list_format')}),
+         {'fields': ('can_use_mailing_list', 'mailing_list_virtual_host',
+                     'mailing_list_address', 'mailing_list_format',
+                     'url_mailing_list_listinfo', 'url_mailing_list_subscribe',
+                     'url_mailing_list_unsubscribe', 
'url_mailing_list_archives',
+                     'url_mailing_list_archives_private', 
'url_mailing_list_admin')}),
         # TODO: finish
         (_('News Manager'), {'fields': ('can_use_news',)}),
         (_('Project Menu Settings'),
diff --git a/src/savane/svmain/models.py b/src/savane/svmain/models.py
index cc16f32..84a3657 100644
--- a/src/savane/svmain/models.py
+++ b/src/savane/svmain/models.py
@@ -1,5 +1,7 @@
-# User extra attributes
-# Copyright (C) 2009  Sylvain Beucler
+# User/group extra attributes
+# Copyright (C) 2002-2006 Mathieu Roy <yeupou--gnu.org>
+# Copyright (C) 2007, 2008, 2009  Sylvain Beucler
+# Copyright (C) 2008  Aleix Conchillo Flaque
 # Copyright (C) 2009  Jonathan Gonzalez V.
 #
 # This file is part of Savane.
@@ -70,7 +72,7 @@ class License(models.Model):
     """
     slug = models.CharField(max_length=32)
     name = models.CharField(max_length=255)
-    url = models.CharField(max_length=255)
+    url = models.CharField(max_length=255, blank=True)
 
     def __unicode__(self):
         return self.slug + ": " + self.name
@@ -98,19 +100,20 @@ class GroupConfiguration(models.Model):
     #admin_email_adress = models.CharField(max_length=128, null=True) # unused
 
     # Redirect to this host when visiting project page
-    base_host = models.CharField(max_length=128)
+    base_host = models.CharField(max_length=128, blank=True)
 
     # Mailing lists
     mailing_list_address = models.CharField(max_length=255, default='@',
       help_text='would be address@hidden for GNU projects at sv.gnu.org')
-    mailing_list_virtual_host = models.CharField(max_length=255, default='',
+    mailing_list_virtual_host = models.CharField(max_length=255, blank=True,
       help_text='would be lists.gnu.org or lists.nongnu.org at sv.gnu.org 
[BACKEND SPECIFIC]')
     mailing_list_format = models.CharField(max_length=255, default='%NAME',
       help_text='With this, you can force projects to follow a specific policy'
         + ' for the name of the %LIST. Here you should use the special 
wildcard'
         + ' %NAME, which is the part the of the mailing list name that the'
         + ' project admin can define (would be %PROJECT-%NAME for non-GNU'
-        + ' projects at sv.gnu.org). Do no add any @hostname here!')
+        + ' projects at sv.gnu.org). Do no add any @hostname here!'
+        + ' You can specify multiple formats separated by a "," comma.')
     #mailing_list_host = models.CharField(max_length=255, 
help_text='DEPRECATED')
 
     # Permissions
@@ -119,7 +122,7 @@ class GroupConfiguration(models.Model):
       help_text='This is useful if you provide directly download areas 
(created'
         + ' by the backend) or if you want to allow projects to configure the'
         + ' related menu entry (see below).')
-    can_use_cvs          = models.BooleanField(default=True)
+    can_use_cvs          = models.BooleanField(default=False)
     can_use_arch         = models.BooleanField(default=False)
     can_use_svn          = models.BooleanField(default=False)
     can_use_git          = models.BooleanField(default=False)
@@ -134,17 +137,17 @@ class GroupConfiguration(models.Model):
         + ' purely a matter of cosmetics. This option is mainly here just to'
         + ' remove this content in case it is useless (it does not makes sense'
         + ' for organizational projects).')
-    can_use_forum        = models.BooleanField(default=False)
-    can_use_mailing_list = models.BooleanField(default=True)
-    can_use_patch        = models.BooleanField(default=False)
-    can_use_task         = models.BooleanField(default=True)
-    can_use_news         = models.BooleanField(default=True)
+    can_use_mailing_list = models.BooleanField(default=True,
+      help_text='This is one of the main issue tracker of Savane.'
+        + ' Projects are supposed to use it as primary interface with end 
user.')
     can_use_support      = models.BooleanField(default=True)
     can_use_bug          = models.BooleanField(default=True)
+    can_use_task         = models.BooleanField(default=True)
+    can_use_patch        = models.BooleanField(default=False)
+    can_use_news         = models.BooleanField(default=True)
     is_menu_configurable_homepage                = 
models.BooleanField(default=False,
       help_text='the homepage link can be modified')
     is_menu_configurable_download                = 
models.BooleanField(default=False)
-    is_menu_configurable_forum                   = 
models.BooleanField(default=False)
     is_menu_configurable_support                 = 
models.BooleanField(default=False)
     is_menu_configurable_mail                    = 
models.BooleanField(default=False)
     is_menu_configurable_cvs                     = 
models.BooleanField(default=False)
@@ -228,14 +231,20 @@ class GroupConfiguration(models.Model):
     url_mailing_list_admin            = models.CharField(max_length=255, 
default='http://')
     url_extralink_documentation = models.CharField(max_length=255, blank=True)
 
+    # Deprecated
+    # "Forum is a deprecated feature of Savane. We do not recommend
+    #  using it and we do not maintain this code any longer."
+    #can_use_forum = models.BooleanField(default=False)
+    #is_menu_configurable_forum = models.BooleanField(default=False)
+    #forum_flags = IntegerField(default='2')
+    #forum_rflags = IntegerField(default='2')
+
     # Unused
     #license_array = models.TextField()
     #devel_status_array = models.TextField()
 
     # TODO: split forum and news config
-    #forum_flags     = IntegerField(default='2')
     #news_flags      = IntegerField(default='3')
-    #forum_rflags    = IntegerField(default='2')
     #news_rflags     = IntegerField(default='2')
 
     # TODO: split tracker config
@@ -291,7 +300,6 @@ class ExtendedGroup(auth_models.Group):
     use_mail                    = models.BooleanField(default=False)
     use_patch                   = models.BooleanField(default=False)
     use_task                    = models.BooleanField(default=False)
-    use_forum                   = models.BooleanField(default=False)
     use_cvs                     = models.BooleanField(default=False)
     use_arch                    = models.BooleanField(default=False)
     use_svn                     = models.BooleanField(default=False)
@@ -307,7 +315,6 @@ class ExtendedGroup(auth_models.Group):
     # blank means 'use default'
     url_homepage                = models.CharField(max_length=255, blank=True)
     url_download                = models.CharField(max_length=255, blank=True)
-    url_forum                   = models.CharField(max_length=255, blank=True)
     url_support                 = models.CharField(max_length=255, blank=True)
     url_mail                    = models.CharField(max_length=255, blank=True)
     url_cvs                     = models.CharField(max_length=255, blank=True)
@@ -338,6 +345,10 @@ class ExtendedGroup(auth_models.Group):
     #dir_homepage = models.CharField(max_length=255)
     #dir_download = models.CharField(max_length=255)
 
+    # Deprecated
+    #url_forum = models.CharField(max_length=255, blank=True)
+    #use_forum = models.BooleanField(default=False)
+
     # TODO: split trackers configuration
     #bugs_preamble = models.TextField()
     #task_preamble = models.TextField()

-----------------------------------------------------------------------

Summary of changes:
 migrate_old_savane.sql      |   10 +-------
 src/savane/svmain/admin.py  |    7 ++++-
 src/savane/svmain/models.py |   45 ++++++++++++++++++++++++++----------------
 3 files changed, 35 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
Savane-cleanup framework