Simple management for shortcut menu of treatment and treatment file (refs #3384)

2 files changed, 9 insertions, 3 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index d05ffdd77..fcb367ae5 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -254,7 +254,8 @@ class OwnPerms:
         query = cls.get_query_owns(user)
         if not query and not replace_query:
             return cls.objects.filter(pk__isnull=True)
-        q = cls.objects.filter(query)
+        if query:
+            q = cls.objects.filter(query)
         if replace_query:
             q = cls.objects.filter(**replace_query)
         if limit:
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 6426fef8f..783c6badb 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -58,7 +58,7 @@ from menus import menu
 from archaeological_files.models import File
 from archaeological_operations.models import Operation
 from archaeological_context_records.models import ContextRecord
-from archaeological_finds.models import Find
+from archaeological_finds.models import Find, Treatment, TreatmentFile
 
 from archaeological_operations.forms import DashboardForm as DashboardFormOpe
 from archaeological_files.forms import DashboardForm as DashboardFormFile
@@ -239,6 +239,9 @@ def shortcut_menu(request):
         CURRENT_ITEMS.append((_(u"Context record"), ContextRecord))
     if profile.find:
         CURRENT_ITEMS.append((_(u"Find"), Find))
+    if profile.warehouse:
+        CURRENT_ITEMS.append((_(u"Treatment file"), TreatmentFile))
+        CURRENT_ITEMS.append((_(u"Treatment"), Treatment))
     if hasattr(request.user, 'ishtaruser') and \
             request.user.ishtaruser.advanced_shortcut_menu:
         dct = {'current_menu': [], 'menu': [],
@@ -301,7 +304,9 @@ def get_current_items(request):
     for key, model in (('file', File),
                        ('operation', Operation),
                        ('contextrecord', ContextRecord),
-                       ('find', Find)):
+                       ('find', Find),
+                       ('treatmentfile', TreatmentFile),
+                       ('treatment', Treatment)):
         currents[key] = None
         if key in request.session and request.session[key]:
             try: