apps.student.simplifiedmetabases: Moved to coreutils.simplified.metab…

…ases.
rebekkjm · Jul 25, 2011 · 8c83a5f · 8c83a5f
1 parent 4207027
commit 8c83a5f
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 18 deletions.
diff --git a/devilry/apps/administrator/simplified.py b/devilry/apps/administrator/simplified.py
@@ -1,17 +1,20 @@
 from ...simplified import (SimplifiedModelApi, simplified_modelapi,
                            PermissionDenied, FieldSpec,
-                           FilterSpecs, FilterSpec, ForeignFilterSpec, PatternFilterSpec)
+                           FilterSpecs, FilterSpec, PatternFilterSpec)
 from ..core import models
-
-from ..student.simplifiedmetabases import (SimplifiedSubjectMetaMixin,
-                                           SimplifiedPeriodMetaMixin, SimplifiedAssignmentMetaMixin,
-                                           SimplifiedAssignmentGroupMetaMixin, SimplifiedDeadlineMetaMixin,
-                                           SimplifiedDeliveryMetaMixin, SimplifiedStaticFeedbackMetaMixin,
-                                           SimplifiedFileMetaMetaMixin)
+from devilry.coreutils.simplified.metabases import (SimplifiedSubjectMetaMixin,
+                                                   SimplifiedPeriodMetaMixin,
+                                                   SimplifiedAssignmentMetaMixin,
+                                                   SimplifiedAssignmentGroupMetaMixin,
+                                                   SimplifiedDeadlineMetaMixin,
+                                                   SimplifiedDeliveryMetaMixin,
+                                                   SimplifiedStaticFeedbackMetaMixin,
+                                                   SimplifiedFileMetaMetaMixin)
 
 __all__ = ('SimplifiedNode', 'SimplifiedSubject', 'SimplifiedPeriod', 'SimplifiedAssignment')
 
 
+
 class CanSaveBase(SimplifiedModelApi):
     """ Mixin class extended by many of the classes in the Simplified API for Administrator """
     @classmethod

diff --git a/devilry/apps/examiner/simplified.py b/devilry/apps/examiner/simplified.py
@@ -1,9 +1,14 @@
 from ...simplified import SimplifiedModelApi, simplified_modelapi, PermissionDenied, FieldSpec
 from ..core import models
-from ..student.simplifiedmetabases import (SimplifiedSubjectMetaMixin, SimplifiedFileMetaMetaMixin,
-                                           SimplifiedPeriodMetaMixin, SimplifiedAssignmentMetaMixin,
-                                           SimplifiedAssignmentGroupMetaMixin, SimplifiedDeadlineMetaMixin,
-                                           SimplifiedDeliveryMetaMixin, SimplifiedStaticFeedbackMetaMixin,)
+from devilry.coreutils.simplified.metabases import (SimplifiedSubjectMetaMixin,
+                                                   SimplifiedFileMetaMetaMixin,
+                                                   SimplifiedPeriodMetaMixin,
+                                                   SimplifiedAssignmentMetaMixin,
+                                                   SimplifiedAssignmentGroupMetaMixin,
+                                                   SimplifiedDeadlineMetaMixin,
+                                                   SimplifiedDeliveryMetaMixin,
+                                                   SimplifiedStaticFeedbackMetaMixin,)
+
 
 
 class PublishedWhereIsExaminerMixin(SimplifiedModelApi):

diff --git a/devilry/apps/student/simplified.py b/devilry/apps/student/simplified.py
@@ -1,11 +1,16 @@
 from datetime import datetime
 
 from ...simplified import simplified_modelapi, SimplifiedModelApi, PermissionDenied
-from simplifiedmetabases import (SimplifiedSubjectMetaMixin, SimplifiedPeriodMetaMixin,
-                                 SimplifiedAssignmentMetaMixin, SimplifiedAssignmentGroupMetaMixin,
-                                 SimplifiedDeadlineMetaMixin, SimplifiedDeliveryMetaMixin,
-                                 SimplifiedStaticFeedbackMetaMixin, SimplifiedFileMetaMetaMixin)
-from restfulmetabases import DeadlineExtjsModelMeta
+from devilry.coreutils.simplified.metabases import (SimplifiedSubjectMetaMixin,
+                                                   SimplifiedPeriodMetaMixin,
+                                                   SimplifiedAssignmentMetaMixin,
+                                                   SimplifiedAssignmentGroupMetaMixin,
+                                                   SimplifiedDeadlineMetaMixin,
+                                                   SimplifiedDeliveryMetaMixin,
+                                                   SimplifiedStaticFeedbackMetaMixin,
+                                                   SimplifiedFileMetaMetaMixin)
+
+
 
 class PublishedWhereIsCandidateMixin(SimplifiedModelApi):
     """ Mixin class extended by all classes in the Simplified API for Student using the Simplified API """

diff --git a/devilry/coreutils/__init__.py b/devilry/coreutils/__init__.py
@@ -0,0 +1 @@
+""" Utility functions and classes shared by many applicaitons that uses apps.core. """
diff --git a/devilry/coreutils/simplified/__init__.py b/devilry/coreutils/simplified/__init__.py
diff --git a/devilry/apps/student/simplifiedmetabases.py → ...oreutils/simplified/metabases/__init__.py b/devilry/apps/student/simplifiedmetabases.py → ...oreutils/simplified/metabases/__init__.py
@@ -1,5 +1,5 @@
-from ..core import models
-from ...simplified import FieldSpec, FilterSpec, FilterSpecs, PatternFilterSpec, ForeignFilterSpec
+from devilry.apps.core import models
+from devilry.simplified import FieldSpec, FilterSpec, FilterSpecs, PatternFilterSpec, ForeignFilterSpec
 
 
 class SimplifiedSubjectMetaMixin(object):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		""" Utility functions and classes shared by many applicaitons that uses apps.core. """