diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-09 00:41:57 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-09 00:41:57 +0200 |
commit | 5230a8e0a06a5d67d6c13f2359bc51be07b4fb5a (patch) | |
tree | 5df1cfe674759003b1599f7334448f9c7f00637d /archaeological_files | |
parent | 06f8d8f45d5c08ec9ed17cee4836f3311703e6df (diff) | |
download | Ishtar-5230a8e0a06a5d67d6c13f2359bc51be07b4fb5a.tar.bz2 Ishtar-5230a8e0a06a5d67d6c13f2359bc51be07b4fb5a.zip |
Shortcut menu: menu is now dynamic - selected items filter dependant items (refs #2996) - can now pin items from sheet (refs #3078)
Diffstat (limited to 'archaeological_files')
-rw-r--r-- | archaeological_files/models.py | 3 | ||||
-rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index eaa9d832e..740ae9a71 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -74,6 +74,7 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, TABLE_COLS = ['numeric_reference', 'year', 'internal_reference', 'file_type', 'saisine_type', 'towns', ] SHOW_URL = 'show-file' + SLUG = 'file' year = models.IntegerField(_(u"Year"), default=lambda: datetime.datetime.now().year) numeric_reference = models.IntegerField( @@ -333,7 +334,7 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, return cls @classmethod - def get_owns(cls, user): + def get_owns(cls, user, menu_filtr=None): owns = super(File, cls).get_owns(user) return sorted(owns, key=lambda x: x.cached_label) diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 5165a0425..211d2b181 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -8,7 +8,7 @@ {% if can_add_operation %} {% window_file_nav item window_id previous next %} {% else %} -{% window_nav item window_id 'show-file' 'file_modify' 'show-historized-file' 'revert-file' previous next %} +{% window_nav item window_id 'show-file' 'file_modify' 'show-historized-file' 'revert-file' previous next 1 %} {% endif %} <h3>{% trans "General"%}</h3> |