X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/133a8f939cdfa69dd6a7caeafed158aa38d20092..3ef231f42d6b4d94e7cad81053e29d2dc7e7a331:/forum/models/__init__.py

diff --git a/forum/models/__init__.py b/forum/models/__init__.py
index df42a5b..2164e36 100644
--- a/forum/models/__init__.py
+++ b/forum/models/__init__.py
@@ -1,43 +1,39 @@
-from question import Question ,QuestionRevision, FavoriteQuestion, QuestionSubscription
-from answer import Answer, AnswerRevision
-from tag import Tag, MarkedTag
-from meta import Vote, FlaggedItem
-from user import User, Activity, ValidationHash, AuthKeyUserAssociation, SubscriptionSettings
-from repute import Badge, Award, Repute
-from node import Node, NodeRevision, NodeMetaClass, AnonymousNode
-from comment import Comment
-from utils import KeyValue
-
-try:
-    from south.modelsinspector import add_introspection_rules
-    add_introspection_rules([], [r"^forum\.models\.utils\.\w+"])
-except:
-    pass
-
-from base import *
-
-def is_new(sender, instance, **kwargs):
-    try:
-        instance._is_new = not bool(instance.id)
-    except:
-        pass
-
-pre_save.connect(is_new)
-
-__all__ = [
-        'Node', 'NodeRevision', 'AnonymousNode', 
-        'Question', 'FavoriteQuestion', 'QuestionSubscription', 'QuestionRevision',
-        'Answer', 'AnswerRevision',
-        'Tag', 'Comment', 'Vote', 'FlaggedItem', 'MarkedTag', 'Badge', 'Award', 'Repute',
-        'Activity', 'ValidationHash', 'AuthKeyUserAssociation', 'SubscriptionSettings', 'KeyValue', 'User',
-        ]
-
-
-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()
\ No newline at end of file
+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()