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

[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  d8b794f3324b89dc0a97a7d5e47127970e717a63 (commit)
      from  a5594e32ae3819ea32e62000957dee5ef3c9219b (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=d8b794f3324b89dc0a97a7d5e47127970e717a63

commit d8b794f3324b89dc0a97a7d5e47127970e717a63
Author: Sylvain Beucler <address@hidden>
Date:   Tue Jul 28 13:20:24 2009 +0200

    - Properly import register_time
    
    - Avoid using null=True in string fields as explained at
      http://docs.djangoproject.com/en/dev/ref/models/fields/#null
    
    - Set some fields as blank=True so they are not mandatory in the admin
      interface

diff --git a/migrate_old_savane.sql b/migrate_old_savane.sql
index 38599f5..479bd45 100644
--- a/migrate_old_savane.sql
+++ b/migrate_old_savane.sql
@@ -171,11 +171,13 @@ INSERT INTO auth_group
 -- license_id <- license+1 (django counts from 1, not from 0)
 -- devel_status_id <- devel_status+1 (django counts from 1, not from 0)
 -- type_id <- type
+-- register_time <- FROM_UNIXTIME(register_time)
 --
 -- Using LEFT JOIN so that if the license isn't known, the project is
 -- not ignored (with license_id=NULL).
 INSERT INTO svmain_extendedgroup
     (group_ptr_id, full_name, license_id, devel_status_id, type_id,
+     register_time,
      is_public,
      status,
      short_description,
@@ -184,7 +186,6 @@ INSERT INTO svmain_extendedgroup
      register_purpose,
      required_software,
      other_comments,
-     register_time,
      registered_gpg_keys,
      use_homepage,
      use_mail,
@@ -225,6 +226,7 @@ INSERT INTO svmain_extendedgroup
      url_patch,
      url_extralink_documentation)
   SELECT group_id, group_name, svmain_license.id, devel_status+1, type,
+      FROM_UNIXTIME(register_time),
       is_public,
       status,
       short_description,
@@ -233,7 +235,6 @@ INSERT INTO svmain_extendedgroup
       register_purpose,
       required_software,
       other_comments,
-      register_time,
       registered_gpg_keys,
       use_homepage,
       use_mail,
diff --git a/src/savane/svmain/models.py b/src/savane/svmain/models.py
index db6e81c..cc16f32 100644
--- a/src/savane/svmain/models.py
+++ b/src/savane/svmain/models.py
@@ -43,9 +43,9 @@ class ExtendedUser(auth_models.User):
     #confirm_hash = models.CharField(max_length=96, blank=True, null=True)
 
     # Keys
-    authorized_keys = models.TextField(blank=True, null=True)
+    authorized_keys = models.TextField(blank=True)
     authorized_keys_count = models.IntegerField(null=True, blank=True)
-    gpg_key = models.TextField(blank=True, null=True)
+    gpg_key = models.TextField(blank=True)
     gpg_key_count = models.IntegerField(null=True, blank=True)
 
     # Personal info
@@ -54,8 +54,8 @@ class ExtendedUser(auth_models.User):
     # Preferences - /!\ some are also in the user_preferences table
     people_view_skills = models.BooleanField(default=False)
     email_hide = models.BooleanField(default=False)
-    timezone = models.CharField(max_length=192, blank=True, null=True)
-    theme = models.CharField(max_length=45, blank=True, null=True)
+    timezone = models.CharField(max_length=192, blank=True)
+    theme = models.CharField(max_length=45, blank=True)
 
 
     # Inherit specialized models.Manager with convenience functions
@@ -98,7 +98,7 @@ 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, null=True)
+    base_host = models.CharField(max_length=128)
 
     # Mailing lists
     mailing_list_address = models.CharField(max_length=255, default='@',
@@ -111,7 +111,7 @@ class GroupConfiguration(models.Model):
         + ' %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!')
-    #mailing_list_host = models.CharField(max_length=255, null=True, 
help_text='DEPRECATED')
+    #mailing_list_host = models.CharField(max_length=255, 
help_text='DEPRECATED')
 
     # Permissions
     can_use_homepage     = models.BooleanField(default=True)
@@ -270,21 +270,21 @@ class ExtendedGroup(auth_models.Group):
         )
     status = models.CharField(max_length=1, choices=status_CHOICES, 
default='A')
     short_description = models.CharField(max_length=255, blank=True)
-    long_description = models.TextField()
-    license = models.ForeignKey(License, null=True)
-    license_other = models.TextField()
+    long_description = models.TextField(blank=True)
+    license = models.ForeignKey(License, blank=True, null=True)
+    license_other = models.TextField(blank=True)
 
     devel_status = models.ForeignKey(DevelopmentStatus)
 
     # Registration-specific
-    register_purpose = models.TextField()
-    required_software = models.TextField()
-    other_comments = models.TextField()
+    register_purpose = models.TextField(blank=True)
+    required_software = models.TextField(blank=True)
+    other_comments = models.TextField(blank=True)
 
     register_time = models.DateTimeField()
     #rand_hash text,
     
-    registered_gpg_keys = models.TextField()
+    registered_gpg_keys = models.TextField(blank=True)
 
     # Project "Features"
     use_homepage                = models.BooleanField(default=False)
@@ -304,39 +304,39 @@ class ExtendedGroup(auth_models.Group):
     use_bugs                    = models.BooleanField(default=False)
     use_extralink_documentation = models.BooleanField(default=False)
 
-    # 'null' means 'use default'
-    url_homepage                = models.CharField(max_length=255, null=True)
-    url_download                = models.CharField(max_length=255, null=True)
-    url_forum                   = models.CharField(max_length=255, null=True)
-    url_support                 = models.CharField(max_length=255, null=True)
-    url_mail                    = models.CharField(max_length=255, null=True)
-    url_cvs                     = models.CharField(max_length=255, null=True)
-    url_cvs_viewcvs             = models.CharField(max_length=255, null=True)
-    url_cvs_viewcvs_homepage    = models.CharField(max_length=255, null=True)
-    url_arch                    = models.CharField(max_length=255, null=True)
-    url_arch_viewcvs            = models.CharField(max_length=255, null=True)
-    url_svn                     = models.CharField(max_length=255, null=True)
-    url_svn_viewcvs             = models.CharField(max_length=255, null=True)
-    url_git                     = models.CharField(max_length=255, null=True)
-    url_git_viewcvs             = models.CharField(max_length=255, null=True)
-    url_hg                      = models.CharField(max_length=255, null=True)
-    url_hg_viewcvs              = models.CharField(max_length=255, null=True)
-    url_bzr                     = models.CharField(max_length=255, null=True)
-    url_bzr_viewcvs             = models.CharField(max_length=255, null=True)
-    url_bugs                    = models.CharField(max_length=255, null=True)
-    url_task                    = models.CharField(max_length=255, null=True)
-    url_patch                   = models.CharField(max_length=255, null=True)
-    url_extralink_documentation = models.CharField(max_length=255, null=True)
+    # 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)
+    url_cvs_viewcvs             = models.CharField(max_length=255, blank=True)
+    url_cvs_viewcvs_homepage    = models.CharField(max_length=255, blank=True)
+    url_arch                    = models.CharField(max_length=255, blank=True)
+    url_arch_viewcvs            = models.CharField(max_length=255, blank=True)
+    url_svn                     = models.CharField(max_length=255, blank=True)
+    url_svn_viewcvs             = models.CharField(max_length=255, blank=True)
+    url_git                     = models.CharField(max_length=255, blank=True)
+    url_git_viewcvs             = models.CharField(max_length=255, blank=True)
+    url_hg                      = models.CharField(max_length=255, blank=True)
+    url_hg_viewcvs              = models.CharField(max_length=255, blank=True)
+    url_bzr                     = models.CharField(max_length=255, blank=True)
+    url_bzr_viewcvs             = models.CharField(max_length=255, blank=True)
+    url_bugs                    = models.CharField(max_length=255, blank=True)
+    url_task                    = models.CharField(max_length=255, blank=True)
+    url_patch                   = models.CharField(max_length=255, blank=True)
+    url_extralink_documentation = models.CharField(max_length=255, blank=True)
 
     # Admin override (unused)
-    #dir_cvs = models.CharField(max_length=255, null=True)
-    #dir_arch = models.CharField(max_length=255, null=True)
-    #dir_svn = models.CharField(max_length=255, null=True)
-    #dir_git = models.CharField(max_length=255, null=True)
-    #dir_hg = models.CharField(max_length=255, null=True)
-    #dir_bzr = models.CharField(max_length=255, null=True)
-    #dir_homepage = models.CharField(max_length=255, null=True)
-    #dir_download = models.CharField(max_length=255, null=True)
+    #dir_cvs = models.CharField(max_length=255)
+    #dir_arch = models.CharField(max_length=255)
+    #dir_svn = models.CharField(max_length=255)
+    #dir_git = models.CharField(max_length=255)
+    #dir_hg = models.CharField(max_length=255)
+    #dir_bzr = models.CharField(max_length=255)
+    #dir_homepage = models.CharField(max_length=255)
+    #dir_download = models.CharField(max_length=255)
 
     # TODO: split trackers configuration
     #bugs_preamble = models.TextField()

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

Summary of changes:
 migrate_old_savane.sql      |    5 +-
 src/savane/svmain/models.py |   88 +++++++++++++++++++++---------------------
 2 files changed, 47 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
Savane-cleanup framework