summaryrefslogtreecommitdiff
path: root/archaeological_files
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_files')
-rw-r--r--archaeological_files/locale/django.pot102
-rw-r--r--archaeological_files/models.py3
-rw-r--r--archaeological_files/templates/ishtar/sheet_file.html2
-rw-r--r--archaeological_files/views.py2
4 files changed, 55 insertions, 54 deletions
diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index 4e149095e..67f2de359 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -9,11 +9,11 @@ msgid ""
msgstr ""
#: forms.py:52 forms.py:212 forms.py:257 forms.py:404 forms.py:431
-#: models.py:77 templates/ishtar/sheet_file.html:146
+#: models.py:78 templates/ishtar/sheet_file.html:146
msgid "Year"
msgstr ""
-#: forms.py:53 forms.py:217 forms.py:259 models.py:80
+#: forms.py:53 forms.py:217 forms.py:259 models.py:81
msgid "Numeric reference"
msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:60 forms.py:415 forms.py:442 models.py:513
+#: forms.py:60 forms.py:415 forms.py:442 models.py:514
msgid "Department"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "File name"
msgstr ""
-#: forms.py:62 forms.py:158 forms.py:223 models.py:88
+#: forms.py:62 forms.py:158 forms.py:223 models.py:89
msgid "File type"
msgstr ""
@@ -45,15 +45,15 @@ msgstr ""
msgid "Saisine type"
msgstr ""
-#: forms.py:65 forms.py:311 models.py:58 models.py:119
+#: forms.py:65 forms.py:311 models.py:58 models.py:120
msgid "Permit type"
msgstr ""
-#: forms.py:67 forms.py:314 models.py:120
+#: forms.py:67 forms.py:314 models.py:121
msgid "Permit reference"
msgstr ""
-#: forms.py:68 forms.py:229 forms.py:372 models.py:149
+#: forms.py:68 forms.py:229 forms.py:372 models.py:150
#: templates/ishtar/sheet_file.html:99
msgid "Comment"
msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
msgid "In charge"
msgstr ""
-#: forms.py:77 forms.py:289 forms.py:453 models.py:95
+#: forms.py:77 forms.py:289 forms.py:453 models.py:96
msgid "General contractor"
msgstr ""
@@ -86,11 +86,11 @@ msgstr ""
msgid "You should select a file."
msgstr ""
-#: forms.py:146 forms.py:221 models.py:128
+#: forms.py:146 forms.py:221 models.py:129
msgid "Creation date"
msgstr ""
-#: forms.py:147 forms.py:324 models.py:130
+#: forms.py:147 forms.py:324 models.py:131
msgid "Reception date"
msgstr ""
@@ -118,23 +118,23 @@ msgstr ""
msgid "General"
msgstr ""
-#: forms.py:206 models.py:90
+#: forms.py:206 models.py:91
msgid "Person in charge"
msgstr ""
-#: forms.py:220 models.py:87
+#: forms.py:220 models.py:88
msgid "Name"
msgstr ""
-#: forms.py:225 models.py:132
+#: forms.py:225 models.py:133
msgid "Related file"
msgstr ""
-#: forms.py:233 models.py:140
+#: forms.py:233 models.py:141
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:236 models.py:146
+#: forms.py:236 models.py:147
msgid "Main address"
msgstr ""
@@ -155,11 +155,11 @@ msgstr ""
msgid "Preventive informations"
msgstr ""
-#: forms.py:301 models.py:107
+#: forms.py:301 models.py:108
msgid "Responsible for town planning service"
msgstr ""
-#: forms.py:317 models.py:143
+#: forms.py:317 models.py:144
msgid "Total developed surface (m2)"
msgstr ""
@@ -168,15 +168,15 @@ msgstr ""
msgid "Research archaeology"
msgstr ""
-#: forms.py:348 models.py:152 templates/ishtar/sheet_file.html:90
+#: forms.py:348 models.py:153 templates/ishtar/sheet_file.html:90
msgid "Departments"
msgstr ""
-#: forms.py:359 models.py:161
+#: forms.py:359 models.py:162
msgid "Scientist in charge"
msgstr ""
-#: forms.py:361 models.py:155 templates/ishtar/sheet_file.html:92
+#: forms.py:361 models.py:156 templates/ishtar/sheet_file.html:92
msgid "Requested operation type"
msgstr ""
@@ -184,11 +184,11 @@ msgstr ""
msgid "Lead organization"
msgstr ""
-#: forms.py:379 models.py:165 templates/ishtar/sheet_file.html:97
+#: forms.py:379 models.py:166 templates/ishtar/sheet_file.html:97
msgid "Classified area"
msgstr ""
-#: forms.py:381 models.py:167 templates/ishtar/sheet_file.html:98
+#: forms.py:381 models.py:168 templates/ishtar/sheet_file.html:98
msgid "Protected area"
msgstr ""
@@ -248,7 +248,7 @@ msgstr ""
msgid "File permit reference"
msgstr ""
-#: ishtar_menu.py:33 models.py:189 templates/ishtar/sheet_file.html:4
+#: ishtar_menu.py:33 models.py:190 templates/ishtar/sheet_file.html:4
msgid "Archaeological file"
msgstr ""
@@ -292,7 +292,7 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:87 models.py:190
+#: ishtar_menu.py:87 models.py:191
#: templates/ishtar/dashboards/dashboard_file.html:8
msgid "Archaeological files"
msgstr ""
@@ -313,111 +313,111 @@ msgstr ""
msgid "Delay (in days)"
msgstr ""
-#: models.py:81
+#: models.py:82
msgid "Internal reference"
msgstr ""
-#: models.py:83
+#: models.py:84
msgid "External ID"
msgstr ""
-#: models.py:86
+#: models.py:87
msgid "External ID is set automatically"
msgstr ""
-#: models.py:98
+#: models.py:99
msgid "General contractor (raw)"
msgstr ""
-#: models.py:102
+#: models.py:103
msgid "General contractor organization"
msgstr ""
-#: models.py:110
+#: models.py:111
msgid "Town planning service (raw)"
msgstr ""
-#: models.py:116
+#: models.py:117
msgid "Town planning service organization"
msgstr ""
-#: models.py:122
+#: models.py:123
msgid "Closing date"
msgstr ""
-#: models.py:123
+#: models.py:124
msgid "Town"
msgstr ""
-#: models.py:125
+#: models.py:126
msgid "Towns"
msgstr ""
-#: models.py:138
+#: models.py:139
msgid "Instruction deadline"
msgstr ""
-#: models.py:144
+#: models.py:145
msgid "Locality"
msgstr ""
-#: models.py:147
+#: models.py:148
msgid "Main address - postal code"
msgstr ""
-#: models.py:157 templates/ishtar/sheet_file.html:93
+#: models.py:158 templates/ishtar/sheet_file.html:93
msgid "Organization"
msgstr ""
-#: models.py:162
+#: models.py:163
msgid "Research archaeology comment"
msgstr ""
-#: models.py:176
+#: models.py:177
msgid "Cached name"
msgstr ""
-#: models.py:177
+#: models.py:178
msgid "Imported line"
msgstr ""
-#: models.py:192
+#: models.py:193
msgid "Can view all Archaelogical files"
msgstr ""
-#: models.py:193
+#: models.py:194
msgid "Can view own Archaelogical file"
msgstr ""
-#: models.py:194
+#: models.py:195
msgid "Can add own Archaelogical file"
msgstr ""
-#: models.py:196
+#: models.py:197
msgid "Can change own Archaelogical file"
msgstr ""
-#: models.py:198
+#: models.py:199
msgid "Can delete own Archaelogical file"
msgstr ""
-#: models.py:199
+#: models.py:200
msgid "Can close File"
msgstr ""
-#: models.py:205
+#: models.py:206
msgid "FILE"
msgstr ""
-#: models.py:374
+#: models.py:375
msgid "Multi-town"
msgstr ""
-#: models.py:380
+#: models.py:381
msgid "No town"
msgstr ""
-#: models.py:512
+#: models.py:513
msgid "File"
msgstr ""
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>
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 7e96c33d3..e457c2ce7 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -143,7 +143,7 @@ get_administrativeactfile = get_item(
'associated_file__permit_reference__icontains'},
reversed_bool_fields=['index__isnull'],
base_request={"associated_file__pk__isnull": False},
- relative_session_names={'file': 'associated_file__pk'})
+ relative_session_names=[('file', 'associated_file__pk')])
def dashboard_file(request, *args, **kwargs):
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-30 09:00:45 +0000