summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/admin.py10
-rw-r--r--archaeological_files/admin.py10
-rw-r--r--archaeological_files/locale/fr/LC_MESSAGES/django.po10
-rw-r--r--archaeological_finds/admin.py8
-rw-r--r--archaeological_operations/admin.py13
-rw-r--r--archaeological_operations/import_from_dbf.py2
-rw-r--r--archaeological_operations/locale/fr/LC_MESSAGES/django.po4
-rwxr-xr-xarchaeological_operations/management/commands/import_operations.py2
-rw-r--r--archaeological_operations/models.py1
-rw-r--r--archaeological_warehouse/admin.py8
-rw-r--r--ishtar_common/admin.py10
-rw-r--r--ishtar_common/locale/fr/LC_MESSAGES/django.po2
-rw-r--r--ishtar_common/models.py2
13 files changed, 45 insertions, 37 deletions
diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 5985f4462..7d6b6be15 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -20,7 +20,7 @@
from django.conf import settings
from django.contrib import admin
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -49,8 +49,8 @@ class ContextRecordSourceAdmin(admin.ModelAdmin):
admin.site.register(models.ContextRecordSource, ContextRecordSourceAdmin)
-basic_models = [models.DatingType, models.DatingQuality,
- models.Unit, models.ActivityType, models.IdentificationType]
+general_models = [models.DatingType, models.DatingQuality,
+ models.Unit, models.ActivityType, models.IdentificationType]
+for model in general_models:
+ admin.site.register(model, GeneralTypeAdmin)
-for model in basic_models:
- admin.site.register(model)
diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py
index 339b19661..e1a5da1d1 100644
--- a/archaeological_files/admin.py
+++ b/archaeological_files/admin.py
@@ -20,7 +20,7 @@
from django.conf import settings
from django.contrib import admin
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -35,8 +35,8 @@ class FileAdmin(HistorizedObjectAdmin):
admin.site.register(models.File, FileAdmin)
-basic_models = [models.FileType, models.PermitType]
+general_models = [models.FileType, models.PermitType]
if settings.COUNTRY == 'fr':
- basic_models.append(models.SaisineType)
-for model in basic_models:
- admin.site.register(model)
+ general_models.append(models.SaisineType)
+for model in general_models:
+ admin.site.register(model, GeneralTypeAdmin)
diff --git a/archaeological_files/locale/fr/LC_MESSAGES/django.po b/archaeological_files/locale/fr/LC_MESSAGES/django.po
index a608f2e8f..851e67f2b 100644
--- a/archaeological_files/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_files/locale/fr/LC_MESSAGES/django.po
@@ -72,19 +72,19 @@ msgstr "Adresse"
#: forms.py:117 models.py:90
msgid "Total surface (m²)"
-msgstr "Surface totale (m²)"
+msgstr "Surface totale des terrains (m²)"
#: forms.py:120 models.py:94
msgid "Main address"
-msgstr "Adresse principale"
+msgstr "Adresse des terrains"
#: forms.py:121 models.py:95
msgid "Main address - complement"
-msgstr "Adresse principale - complément"
+msgstr "Adresse des terrains - complément"
#: forms.py:123 models.py:97
msgid "Main address - postal code"
-msgstr "Adresse principale - code postal"
+msgstr "Adresse des terrains - code postal"
#: forms.py:127
msgid "Preventive informations"
@@ -116,7 +116,7 @@ msgstr "Date de réception"
#: forms.py:166
msgid "Would you like to close this archaeological file?"
-msgstr "Voulez vous clôturer ce dossier archéologique ?"
+msgstr "Voulez vous clore ce dossier archéologique ?"
#: forms.py:171
msgid "Would you like to delete this archaelogical file ?"
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 096f05bf3..04259b368 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -20,7 +20,7 @@
from django.conf import settings
from django.contrib import admin
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -70,6 +70,6 @@ class TreatmentSourceAdmin(admin.ModelAdmin):
admin.site.register(models.TreatmentSource, TreatmentSourceAdmin)
-basic_models = [models.MaterialType, models.TreatmentType]
-for model in basic_models:
- admin.site.register(model)
+general_models = [models.MaterialType, models.TreatmentType]
+for model in general_models:
+ admin.site.register(model, GeneralTypeAdmin)
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index de8b47edc..01b125e60 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,7 @@
from django.conf import settings
from django.contrib import admin
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -33,7 +33,7 @@ class AdministrativeActAdmin(HistorizedObjectAdmin):
admin.site.register(models.AdministrativeAct, AdministrativeActAdmin)
class PeriodAdmin(admin.ModelAdmin):
- list_display = ('label', 'start_date', 'end_date', 'parent')
+ list_display = ('label', 'start_date', 'end_date', 'parent', 'available')
model = models.Period
admin.site.register(models.Period, PeriodAdmin)
@@ -66,7 +66,10 @@ class ParcelAdmin(HistorizedObjectAdmin):
admin.site.register(models.Parcel, ParcelAdmin)
-basic_models = [models.OperationType, models.RemainType, models.ActType,
- models.ParcelOwner]
+general_models = [models.OperationType, models.RemainType, models.ActType]
+for model in general_models:
+ admin.site.register(model, GeneralTypeAdmin)
+
+basic_models = [models.ParcelOwner]
for model in basic_models:
admin.site.register(model)
diff --git a/archaeological_operations/import_from_dbf.py b/archaeological_operations/import_from_dbf.py
index d0f55cdbe..843e5151c 100644
--- a/archaeological_operations/import_from_dbf.py
+++ b/archaeological_operations/import_from_dbf.py
@@ -247,8 +247,6 @@ def import_operations_dbf(values, col_defs=DBF_OPE_COLS, update=False,
for line_idx, vals in enumerate(values):
if stdout:
stdout.write("\r* line %d" % (line_idx))
- if not line_idx:
- continue # remove header
args = {}
for col_idx, val in enumerate(vals):
if len(col_defs) <= col_idx or not col_defs[col_idx]:
diff --git a/archaeological_operations/locale/fr/LC_MESSAGES/django.po b/archaeological_operations/locale/fr/LC_MESSAGES/django.po
index 0841a6c89..4d16482b7 100644
--- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_operations/locale/fr/LC_MESSAGES/django.po
@@ -97,7 +97,7 @@ msgstr "Date de fin de chantier"
#: forms.py:176 templates/ishtar/dashboards/dashboard_operation.html:315
msgid "Total surface (m²)"
-msgstr "Surface totale (m²)"
+msgstr "Surface totale des terrains (m²)"
#: forms.py:183 models.py:78 models.py:157
msgid "Operation code"
@@ -206,7 +206,7 @@ msgstr "Il y a des périodes identiques."
#: forms.py:341
msgid "Would you like to close this operation?"
-msgstr "Voulez vous clôturer cette opération ?"
+msgstr "Voulez vous clore cette opération ?"
#: forms.py:345
msgid "Would you like to delete this operation?"
diff --git a/archaeological_operations/management/commands/import_operations.py b/archaeological_operations/management/commands/import_operations.py
index cdcbff54b..3cf4a569d 100755
--- a/archaeological_operations/management/commands/import_operations.py
+++ b/archaeological_operations/management/commands/import_operations.py
@@ -33,7 +33,7 @@ class Command(BaseCommand):
def handle(self, *args, **options):
if not args or not args[0]:
- raise CommandError("No file provided." % args[0])
+ raise CommandError("No file provided.")
filename = args[0]
update = len(args) > 1 and args[1]
file_type = len(args) > 1 and args[2]
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 02ec1a912..d7dc18b3c 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -38,6 +38,7 @@ class OperationType(GeneralType):
class Meta:
verbose_name = _(u"Operation type")
verbose_name_plural = _(u"Operation types")
+ ordering = ['label']
@classmethod
def is_preventive(cls, ope_type_id, key=''):
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py
index cf026e86c..b76c48308 100644
--- a/archaeological_warehouse/admin.py
+++ b/archaeological_warehouse/admin.py
@@ -20,7 +20,7 @@
from django.conf import settings
from django.contrib import admin
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -46,6 +46,6 @@ class ContainerAdmin(admin.ModelAdmin):
admin.site.register(models.Container, ContainerAdmin)
-basic_models = [models.WarehouseType]
-for model in basic_models:
- admin.site.register(model)
+general_models = [models.WarehouseType]
+for model in general_models:
+ admin.site.register(model, GeneralTypeAdmin)
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 8f6a07f88..b470f8223 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -81,8 +81,14 @@ class PersonTypeAdmin(admin.ModelAdmin):
admin.site.register(models.PersonType, PersonTypeAdmin)
-basic_models = [models.IshtarUser, models.SourceType, models.AuthorType,
- models.OrganizationType]
+class GeneralTypeAdmin(admin.ModelAdmin):
+ list_display = ('label', 'txt_idx', 'available')
+
+general_models = [models.OrganizationType, models.SourceType, models.AuthorType]
+for model in general_models:
+ admin.site.register(model, GeneralTypeAdmin)
+
+basic_models = [models.IshtarUser]
if settings.COUNTRY == 'fr':
basic_models += [models.Arrondissement, models.Canton]
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 636601db5..96a467273 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -897,7 +897,7 @@ msgstr "Dossier en relation avec :"
#: templates/sheet_file.html:46 templates/sheet_ope.html:49
#: templates/sheet_ope_modif.html:49 templates/sheet_operation.html:49
msgid "Main address:"
-msgstr "Adresse principale :"
+msgstr "Adresse des terrains :"
#: templates/sheet_file.html:47 templates/sheet_ope.html:50
#: templates/sheet_ope_modif.html:50 templates/sheet_operation.html:50
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 3e428999e..458802087 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -206,7 +206,7 @@ class GeneralType(models.Model):
items = cls.objects.filter(**dct)
if exclude:
items = items.exclude(txt_idx__in=exclude)
- for item in items.all():
+ for item in items.order_by(*cls._meta.ordering).all():
if instances:
item.rank = 0
yield item
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-26 06:04:33 +0000