osqa-23

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

diff --git a/forum/models/__init__.py b/forum/models/__init__.py
index ef1e84b95ec8dbbf9086c49235aa9c2bcc8df6f3..2c9c9970aad196a48b42019935d197ec8e91ca4e 100644 (file)
--- a/forum/models/__init__.py
+++ b/forum/models/__init__.py
@@ -1,32 +1,28 @@
-from question import Question ,QuestionRevision, AnonymousQuestion, FavoriteQuestion, QuestionSubscription\r
-from answer import Answer, AnonymousAnswer, AnswerRevision\r
+from question import Question ,QuestionRevision, QuestionSubscription\r
+from answer import Answer, AnswerRevision\r

 from tag import Tag, MarkedTag\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 user import User, ValidationHash, AuthKeyUserAssociation, SubscriptionSettings\r
+from node import Node, NodeRevision, NodeMetaClass\r
+from comment import Comment\r
+from action import Action, ActionRepute\r
+from meta import Vote, Flag, Badge, Award\r

 from utils import KeyValue\r
 \r
 try:\r
     from south.modelsinspector import add_introspection_rules\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
+    add_introspection_rules([], [r"^forum\.models\.\w+\.\w+"])\r

 except:\r
     pass\r
 \r
 from base import *\r
 \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
 __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
+        'Node', 'NodeRevision',  \r
+        'Question', 'QuestionSubscription', 'QuestionRevision',\r
+        'Answer', 'AnswerRevision',\r
+        'Tag', 'Comment', 'MarkedTag', 'Badge', 'Award',\r
+        'ValidationHash', 'AuthKeyUserAssociation', 'SubscriptionSettings', 'KeyValue', 'User',\r
+        'Action', 'ActionRepute', 'Vote', 'Flag'\r

         ]\r
 \r
 \r
         ]\r
 \r
 \r


@@ -36,3 +32,6 @@ for k, v in get_modules_script_classes('models', models.Model).items():
     if not k in __all__:\r
         __all__.append(k)\r
         exec "%s = v" % k\r
     if not k in __all__:\r
         __all__.append(k)\r
         exec "%s = v" % k\r

+\r
+NodeMetaClass.setup_relations()\r
+BaseMetaClass.setup_denormalizes()
\ No newline at end of file