summaryrefslogtreecommitdiff
path: root/ishtar_common/models_common.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/models_common.py')
-rw-r--r--ishtar_common/models_common.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 928b22630..c6b1316e4 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -725,6 +725,17 @@ class GeneralType(Cached, models.Model):
item.generate_key()
+class OrderedModel(models.Model):
+ order = models.IntegerField(_("Order"), default=10)
+ class Meta:
+ abstract = True
+
+
+class OrderedType(OrderedModel, GeneralType):
+ class Meta:
+ abstract = True
+
+
class HierarchicalType(GeneralType):
parent = models.ForeignKey(
"self",
@@ -758,6 +769,11 @@ class HierarchicalType(GeneralType):
parent = parent.parent
+class OrderedHierarchicalType(OrderedModel, HierarchicalType):
+ class Meta:
+ abstract = True
+
+
class StatisticItem:
STATISTIC_MODALITIES = [] # example: "year", "operation_type__label"
STATISTIC_MODALITIES_OPTIONS = OrderedDict() # example:
@@ -3297,7 +3313,7 @@ class MainItem(ShortMenuItem, SerializeItem, SheetItem):
if not getattr(request.user, "ishtaruser", None):
return False
user = request.user
- return user.ishtaruser.has_right(action_name, request.session)\
+ return user.ishtaruser.has_right(action_name, request.session)
def get_extra_actions(self, request):
if not hasattr(self, "SLUG"):