Reintegrate merge cacheimp -> trunk.

[osqa.git] / forum / models / __init__.py

diff --git a/forum/models/__init__.py b/forum/models/__init__.py
index ef1e84b95ec8dbbf9086c49235aa9c2bcc8df6f3..2164e366f60957b786afbc8ee5b4c0c8672647d8 100644 (file)
--- a/forum/models/__init__.py
+++ b/forum/models/__init__.py
@@ -1,38 +1,39 @@
-from question import Question ,QuestionRevision, AnonymousQuestion, FavoriteQuestion, QuestionSubscription\r
-from answer import Answer, AnonymousAnswer, AnswerRevision\r
-from tag import Tag, MarkedTag\r
-from meta import Vote, Comment, FlaggedItem, LikedComment\r
-from user import User, Activity, ValidationHash, AuthKeyUserAssociation, SubscriptionSettings\r
-from repute import Badge, Award, Repute\r
-from utils import KeyValue\r
-\r
-try:\r
-    from south.modelsinspector import add_introspection_rules\r
-    add_introspection_rules([], [r"^forum\.models\.utils\.\w+"])\r
-except:\r
-    pass\r
-\r
-from base import *\r
-\r
-def is_new(sender, instance, **kwargs):\r
-    try:\r
-        instance._is_new = not bool(instance.id)\r
-    except:\r
-        pass\r
-\r
-pre_save.connect(is_new)\r
-\r
-__all__ = [\r
-        'Question', 'QuestionRevision', 'FavoriteQuestion', 'AnonymousQuestion', 'QuestionSubscription',\r
-        'Answer', 'AnswerRevision', 'AnonymousAnswer',\r
-        'Tag', 'Comment', 'Vote', 'FlaggedItem', 'MarkedTag', 'LikedComment', 'Badge', 'Award', 'Repute',\r
-        'Activity', 'ValidationHash', 'AuthKeyUserAssociation', 'SubscriptionSettings', 'KeyValue', 'User',\r
-        ]\r
-\r
-\r
-from forum.modules import get_modules_script_classes\r
-\r
-for k, v in get_modules_script_classes('models', models.Model).items():\r
-    if not k in __all__:\r
-        __all__.append(k)\r
-        exec "%s = v" % k\r
+import forum.utils.djangofix
+from question import Question ,QuestionRevision, QuestionSubscription
+from answer import Answer, AnswerRevision
+from tag import Tag, MarkedTag
+from user import User, ValidationHash, AuthKeyUserAssociation, SubscriptionSettings
+from node import Node, NodeRevision, NodeState, NodeMetaClass
+from comment import Comment
+from action import Action, ActionRepute
+from meta import Vote, Flag, Badge, Award
+from utils import KeyValue
+from page import Page
+
+try:
+    from south.modelsinspector import add_introspection_rules
+    add_introspection_rules([], [r"^forum\.models\.\w+\.\w+"])
+except:
+    pass
+
+from base import *
+
+__all__ = [
+        'Node', 'NodeRevision', 'NodeState',  
+        'Question', 'QuestionSubscription', 'QuestionRevision',
+        'Answer', 'AnswerRevision',
+        'Tag', 'Comment', 'MarkedTag', 'Badge', 'Award',
+        'ValidationHash', 'AuthKeyUserAssociation', 'SubscriptionSettings', 'KeyValue', 'User',
+        'Action', 'ActionRepute', 'Vote', 'Flag', 'Page'
+        ]
+
+
+from forum.modules import get_modules_script_classes
+
+for k, v in get_modules_script_classes('models', models.Model).items():
+    if not k in __all__:
+        __all__.append(k)
+        exec "%s = v" % k
+
+NodeMetaClass.setup_relations()
+BaseMetaClass.setup_denormalizes()