Reintegrate merge cacheimp -> trunk.

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

diff --git a/forum/models/__init__.py b/forum/models/__init__.py
index 449ca3a8d94a7b5cc5c83681ab24cd5e1b05e949..2164e366f60957b786afbc8ee5b4c0c8672647d8 100644 (file)
--- a/forum/models/__init__.py
+++ b/forum/models/__init__.py
@@ -1,3 +1,4 @@
+import forum.utils.djangofix

 from question import Question ,QuestionRevision, QuestionSubscription
 from answer import Answer, AnswerRevision
 from tag import Tag, MarkedTag
 from question import Question ,QuestionRevision, QuestionSubscription
 from answer import Answer, AnswerRevision
 from tag import Tag, MarkedTag


@@ -7,6 +8,7 @@ from comment import Comment
 from action import Action, ActionRepute
 from meta import Vote, Flag, Badge, Award
 from utils import KeyValue
 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
 
 try:
     from south.modelsinspector import add_introspection_rules


@@ -22,7 +24,7 @@ __all__ = [
         'Answer', 'AnswerRevision',
         'Tag', 'Comment', 'MarkedTag', 'Badge', 'Award',
         'ValidationHash', 'AuthKeyUserAssociation', 'SubscriptionSettings', 'KeyValue', 'User',
         'Answer', 'AnswerRevision',
         'Tag', 'Comment', 'MarkedTag', 'Badge', 'Award',
         'ValidationHash', 'AuthKeyUserAssociation', 'SubscriptionSettings', 'KeyValue', 'User',

-        'Action', 'ActionRepute', 'Vote', 'Flag'
+        'Action', 'ActionRepute', 'Vote', 'Flag', 'Page'

         ]
 
 
         ]
 
 


@@ -34,4 +36,4 @@ for k, v in get_modules_script_classes('models', models.Model).items():
         exec "%s = v" % k
 
 NodeMetaClass.setup_relations()
         exec "%s = v" % k
 
 NodeMetaClass.setup_relations()

-BaseMetaClass.setup_denormalizes()
\ No newline at end of file
+BaseMetaClass.setup_denormalizes()