Fixes OSQA 281, Start/Stop notificatins button does not store the notifications and...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@336 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/tests.py b/forum/tests.py
new file mode 100644 (file)
index 0000000..194262e
--- /dev/null
+++ b/forum/tests.py
@@ -0,0 +1,23 @@
+import unittest
+from django.test.client import Client
+
+import forum.startup
+
+from forum.models import *
+from forum.actions import *
+
+client = Client()
+
+class SanityTest(unittest.TestCase):
+    def testIndex(self):
+        self.assertEquals(client.get('/').status_code, 200)
+
+class FirstUsersTest(unittest.TestCase):
+    def setUp(self):
+        self.response = client.get('/')
+
+    def testResponse(self):
+        self.assertEquals(self.response.status_code, 200)
+        
+
+        

diff --git a/forum/views/users.py b/forum/views/users.py
index 7202d39e7fbd2f2a5b1e8f758048972dd6572b72..6bc3477d35c4461d6618e88527572a41c53ee083 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -250,13 +250,13 @@ def user_subscriptions(request, user):
                 request.user.message_set.create(message=_('Notifications are now enabled'))\r
             else:\r
                 request.user.message_set.create(message=_('Notifications are now disabled'))\r
-        else:\r
-            form.is_valid()\r
-            for k,v in form.cleaned_data.items():\r
-                setattr(user.subscription_settings, k, v)\r
 \r
-            user.subscription_settings.save()\r
-            request.user.message_set.create(message=_('New subscription settings are now saved'))\r
+        form.is_valid()\r
+        for k,v in form.cleaned_data.items():\r
+            setattr(user.subscription_settings, k, v)\r
+\r
+        user.subscription_settings.save()\r
+        request.user.message_set.create(message=_('New subscription settings are now saved'))\r
     else:\r
         form = SubscriptionSettingsForm(user.subscription_settings.__dict__)\r
 \r

diff --git a/forum_modules/sximporter/orm.py b/forum_modules/sximporter/orm.py
index 6b95d10dba34e78fdb86d5883caf6eeaec22776b..39439bc0a361f952696090eed92d480551210179 100644 (file)
--- a/forum_modules/sximporter/orm.py
+++ b/forum_modules/sximporter/orm.py
@@ -16,7 +16,7 @@ class Migration(DataMigration):
             'Meta': {'object_name': 'Group'},\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),\r
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})\r
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})\r
         },\r
         'auth.permission': {\r
             'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},\r
@@ -30,7 +30,7 @@ class Migration(DataMigration):
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),\r
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),\r
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),\r
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),\r
             'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),\r
@@ -38,7 +38,7 @@ class Migration(DataMigration):
             'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),\r
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),\r
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),\r
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),\r
             'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})\r
         },\r
         'contenttypes.contenttype': {\r
@@ -81,9 +81,9 @@ class Migration(DataMigration):
         },\r
         'forum.award': {\r
             'Meta': {'unique_together': "(('user', 'badge', 'node'),)", 'object_name': 'Award'},\r
-            'action': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
+            'action': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'award'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
             'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
-            'badge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Badge']"}),\r
+            'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'awards'", 'to': "orm['forum.Badge']"}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'node': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Node']", 'null': 'True'}),\r
             'trigger': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'awards'", 'null': 'True', 'to': "orm['forum.Action']"}),\r
@@ -92,19 +92,19 @@ class Migration(DataMigration):
         'forum.badge': {\r
             'Meta': {'object_name': 'Badge'},\r
             'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),\r
-            'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'through': "'Award'", 'to': "orm['forum.User']"}),\r
+            'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['forum.Award']", 'to': "orm['forum.User']"}),\r
             'cls': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'type': ('django.db.models.fields.SmallIntegerField', [], {})\r
         },\r
         'forum.flag': {\r
             'Meta': {'unique_together': "(('user', 'node'),)", 'object_name': 'Flag'},\r
-            'action': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'flag'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
+            'action': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'flag'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
+            'flagged_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
-            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Node']"}),\r
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'flags'", 'to': "orm['forum.Node']"}),\r
             'reason': ('django.db.models.fields.CharField', [], {'max_length': '300'}),\r
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.User']"}),\r
-            'flagged_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'flags'", 'to': "orm['forum.User']"})\r
         },\r
         'forum.keyvalue': {\r
             'Meta': {'object_name': 'KeyValue'},\r
@@ -126,12 +126,9 @@ class Migration(DataMigration):
             'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
             'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nodes'", 'to': "orm['forum.User']"}),\r
             'body': ('django.db.models.fields.TextField', [], {}),\r
-            'deleted': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'deleted_node'", 'unique': 'True', 'null': 'True', 'to': "orm['forum.Action']"}),\r
-            'extra_action': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'extra_node'", 'null': 'True', 'to': "orm['forum.Action']"}),\r
             'extra_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),\r
             'extra_ref': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Node']", 'null': 'True'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
-            'in_moderation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'moderated_node'", 'unique': 'True', 'null': 'True', 'to': "orm['forum.Action']"}),\r
             'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),\r
             'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.User']", 'null': 'True'}),\r
             'last_edited': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edited_node'", 'unique': 'True', 'null': 'True', 'to': "orm['forum.Action']"}),\r
@@ -139,10 +136,10 @@ class Migration(DataMigration):
             'node_type': ('django.db.models.fields.CharField', [], {'default': "'node'", 'max_length': '16'}),\r
             'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'children'", 'null': 'True', 'to': "orm['forum.Node']"}),\r
             'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),\r
+            'state_string': ('django.db.models.fields.TextField', [], {'default': "''"}),\r
             'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}),\r
-            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'nodes'", 'to': "orm['forum.Tag']"}),\r
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}),\r
-            'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'})\r
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'nodes'", 'symmetrical': 'False', 'to': "orm['forum.Tag']"}),\r
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '300'})\r
         },\r
         'forum.noderevision': {\r
             'Meta': {'unique_together': "(('node', 'revision'),)", 'object_name': 'NodeRevision'},\r
@@ -156,6 +153,13 @@ class Migration(DataMigration):
             'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}),\r
             'title': ('django.db.models.fields.CharField', [], {'max_length': '300'})\r
         },\r
+        'forum.nodestate': {\r
+            'Meta': {'unique_together': "(('node', 'state_type'),)", 'object_name': 'NodeState'},\r
+            'action': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'node_state'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'states'", 'to': "orm['forum.Node']"}),\r
+            'state_type': ('django.db.models.fields.CharField', [], {'max_length': '16'})\r
+        },\r
         'forum.openidassociation': {\r
             'Meta': {'object_name': 'OpenIdAssociation'},\r
             'assoc_type': ('django.db.models.fields.TextField', [], {'max_length': '64'}),\r
@@ -177,7 +181,7 @@ class Migration(DataMigration):
             'Meta': {'object_name': 'QuestionSubscription'},\r
             'auto_subscription': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
-            'last_view': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 5, 3, 11, 46, 22, 80000)'}),\r
+            'last_view': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 5, 25, 0, 18, 31, 631000)'}),\r
             'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Node']"}),\r
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.User']"})\r
         },\r
@@ -205,11 +209,8 @@ class Migration(DataMigration):
         'forum.tag': {\r
             'Meta': {'object_name': 'Tag'},\r
             'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['forum.User']"}),\r
-            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),\r
-            'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),\r
-            'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['forum.User']"}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
-            'marked_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'marked_tags'", 'through': "'MarkedTag'", 'to': "orm['forum.User']"}),\r
+            'marked_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'marked_tags'", 'symmetrical': 'False', 'through': "orm['forum.MarkedTag']", 'to': "orm['forum.User']"}),\r
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),\r
             'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'})\r
         },\r
@@ -224,15 +225,15 @@ class Migration(DataMigration):
             'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
             'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),\r
             'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),\r
-            'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),\r
+            'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),\r
             'silver': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),\r
-            'subscriptions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'subscribers'", 'through': "'QuestionSubscription'", 'to': "orm['forum.Node']"}),\r
+            'subscriptions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'subscribers'", 'symmetrical': 'False', 'through': "orm['forum.QuestionSubscription']", 'to': "orm['forum.Node']"}),\r
             'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),\r
             'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})\r
         },\r
         'forum.validationhash': {\r
             'Meta': {'unique_together': "(('user', 'type'),)", 'object_name': 'ValidationHash'},\r
-            'expiration': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 5, 4, 11, 46, 28, 428000)'}),\r
+            'expiration': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 5, 26, 0, 18, 31, 914000)'}),\r
             'hash_code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'seed': ('django.db.models.fields.CharField', [], {'max_length': '12'}),\r
@@ -241,12 +242,12 @@ class Migration(DataMigration):
         },\r
         'forum.vote': {\r
             'Meta': {'unique_together': "(('user', 'node'),)", 'object_name': 'Vote'},\r
-            'action': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vote'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
+            'action': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'vote'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
-            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Node']"}),\r
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.User']"}),\r
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['forum.Node']"}),\r
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['forum.User']"}),\r
             'value': ('django.db.models.fields.SmallIntegerField', [], {}),\r
-            'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
+            'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'})\r
         }\r
     }\r
 \r

diff --git a/settings.py b/settings.py
index a7c589300508523648a62fe07d68b59b85765799..ba549f12f6d657cefe1b9d25e801e55f36eea39d 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -79,11 +79,11 @@ if DEBUG:
     except:
         pass
 
-try:
-    import south
-    INSTALLED_APPS.append('south')
-except:
-    pass
+#try:
+#    import south
+#    INSTALLED_APPS.append('south')
+#except:
+#    pass
 
 if not DEBUG:
     try: