Registration fix for OLD #2

by-cx · Nov 20, 2013 · 6b36690 · 6b36690
1 parent 118131b
commit 6b36690
Show file tree

Hide file tree

Showing 3 changed files with 133 additions and 8 deletions.
diff --git a/...migrations/0003_auto__chg_field_parms_web_machine__chg_field_parms_mail_machine__chg_f.py b/...migrations/0003_auto__chg_field_parms_web_machine__chg_field_parms_mail_machine__chg_f.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Parms.web_machine'
+        db.alter_column(u'clients_parms', 'web_machine_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['clients.Machine']))
+
+        # Changing field 'Parms.mail_machine'
+        db.alter_column(u'clients_parms', 'mail_machine_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['clients.Machine']))
+
+        # Changing field 'Parms.pgsql_machine'
+        db.alter_column(u'clients_parms', 'pgsql_machine_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['clients.Machine']))
+
+        # Changing field 'Parms.mysql_machine'
+        db.alter_column(u'clients_parms', 'mysql_machine_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['clients.Machine']))
+
+    def backwards(self, orm):
+
+        # User chose to not deal with backwards NULL issues for 'Parms.web_machine'
+        raise RuntimeError("Cannot reverse this migration. 'Parms.web_machine' and its values cannot be restored.")
+
+        # User chose to not deal with backwards NULL issues for 'Parms.mail_machine'
+        raise RuntimeError("Cannot reverse this migration. 'Parms.mail_machine' and its values cannot be restored.")
+
+        # User chose to not deal with backwards NULL issues for 'Parms.pgsql_machine'
+        raise RuntimeError("Cannot reverse this migration. 'Parms.pgsql_machine' and its values cannot be restored.")
+
+        # User chose to not deal with backwards NULL issues for 'Parms.mysql_machine'
+        raise RuntimeError("Cannot reverse this migration. 'Parms.mysql_machine' and its values cannot be restored.")
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'clients.address': {
+            'Meta': {'object_name': 'Address'},
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'company': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'company_number': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'default': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'removed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'vat_number': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'zip': ('django.db.models.fields.CharField', [], {'max_length': '12'})
+        },
+        u'clients.machine': {
+            'Meta': {'object_name': 'Machine'},
+            'domain': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'ipv6': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'clients.parms': {
+            'Meta': {'object_name': 'Parms'},
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'CZK'", 'max_length': '20'}),
+            'discount': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'enable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'fee': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'gid': ('django.db.models.fields.IntegerField', [], {}),
+            'guard_enable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'home': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'installed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_notification': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'low_level_credits': ('django.db.models.fields.CharField', [], {'default': "'send_email'", 'max_length': '30'}),
+            'mail_machine': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mail'", 'null': 'True', 'to': u"orm['clients.Machine']"}),
+            'mysql_machine': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mysql'", 'null': 'True', 'to': u"orm['clients.Machine']"}),
+            'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'num_reminds': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'pgsql_machine': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'pgsql'", 'null': 'True', 'to': u"orm['clients.Machine']"}),
+            'uid': ('django.db.models.fields.IntegerField', [], {}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),
+            'web_machine': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'web'", 'null': 'True', 'to': u"orm['clients.Machine']"})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['clients']
diff --git a/wsgiadmin/clients/models.py b/wsgiadmin/clients/models.py
@@ -40,10 +40,10 @@ class Parms(models.Model):
     installed = models.BooleanField(_("Installed"), default=False)
 
     #address		= models.ForeignKey("address")
-    web_machine = models.ForeignKey(Machine, related_name="web")
-    mail_machine = models.ForeignKey(Machine, related_name="mail")
-    mysql_machine = models.ForeignKey(Machine, related_name="mysql")
-    pgsql_machine = models.ForeignKey(Machine, related_name="pgsql")
+    web_machine = models.ForeignKey(Machine, related_name="web", blank=True, null=True, default=None)
+    mail_machine = models.ForeignKey(Machine, related_name="mail", blank=True, null=True, default=None)
+    mysql_machine = models.ForeignKey(Machine, related_name="mysql", blank=True, null=True, default=None)
+    pgsql_machine = models.ForeignKey(Machine, related_name="pgsql", blank=True, null=True, default=None)
 
     user = models.OneToOneField(user, verbose_name=_(u'Uživatel'))
 

diff --git a/wsgiadmin/useradmin/views.py b/wsgiadmin/useradmin/views.py
@@ -254,10 +254,11 @@ def reg(request):
             p.uid = 0
             p.gid = 0
             p.discount = 0
-            p.web_machine = m_web
-            p.mail_machine = m_mail
-            p.mysql_machine = m_mysql
-            p.pgsql_machine = m_pgsql
+            if settings.OLD:
+                p.web_machine = m_web
+                p.mail_machine = m_mail
+                p.mysql_machine = m_mysql
+                p.pgsql_machine = m_pgsql
             p.user = u
             p.save()