summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/__init__.py1
-rw-r--r--archaeological_context_records/admin.py17
-rw-r--r--archaeological_files/__init__.py1
-rw-r--r--archaeological_files/admin.py6
-rw-r--r--archaeological_finds/__init__.py1
-rw-r--r--archaeological_finds/admin.py23
-rw-r--r--archaeological_operations/__init__.py1
-rw-r--r--archaeological_operations/admin.py25
-rw-r--r--archaeological_warehouse/__init__.py1
-rw-r--r--archaeological_warehouse/admin.py9
-rw-r--r--example_project/urls.py5
-rw-r--r--ishtar_common/__init__.py2
-rw-r--r--ishtar_common/admin.py57
-rw-r--r--ishtar_common/apps.py41
14 files changed, 122 insertions, 68 deletions
diff --git a/archaeological_context_records/__init__.py b/archaeological_context_records/__init__.py
index e69de29bb..8b0803727 100644
--- a/archaeological_context_records/__init__.py
+++ b/archaeological_context_records/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'ishtar_common.apps.ArchaeologicalContextRecordConfig'
diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 567f50014..9b8cae4e2 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -19,6 +19,7 @@
from django.contrib import admin
+from ishtar_common.apps import admin_site
from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -30,7 +31,7 @@ class DatingAdmin(admin.ModelAdmin):
list_filter = ("period", 'dating_type', 'quality')
model = models.Dating
-admin.site.register(models.Dating, DatingAdmin)
+admin_site.register(models.Dating, DatingAdmin)
class ContextRecordAdmin(HistorizedObjectAdmin):
@@ -41,7 +42,7 @@ class ContextRecordAdmin(HistorizedObjectAdmin):
'datings__period__label')
model = models.ContextRecord
-admin.site.register(models.ContextRecord, ContextRecordAdmin)
+admin_site.register(models.ContextRecord, ContextRecordAdmin)
class ContextRecordSourceAdmin(admin.ModelAdmin):
@@ -50,40 +51,40 @@ class ContextRecordSourceAdmin(admin.ModelAdmin):
search_fields = ('title', )
model = models.ContextRecordSource
-admin.site.register(models.ContextRecordSource, ContextRecordSourceAdmin)
+admin_site.register(models.ContextRecordSource, ContextRecordSourceAdmin)
class RecordRelationsAdmin(admin.ModelAdmin):
list_display = ('left_record', 'relation_type', 'right_record')
list_filter = ('relation_type',)
-admin.site.register(models.RecordRelations, RecordRelationsAdmin)
+admin_site.register(models.RecordRelations, RecordRelationsAdmin)
class RelationTypeAdmin(admin.ModelAdmin):
list_display = ('label', 'txt_idx', 'tiny_label', 'available',
'symmetrical', 'inverse_relation', 'order', 'comment')
-admin.site.register(models.RelationType, RelationTypeAdmin)
+admin_site.register(models.RelationType, RelationTypeAdmin)
class UnitAdmin(admin.ModelAdmin):
list_display = ['label', 'txt_idx', 'parent', 'available', 'order',
'comment']
-admin.site.register(models.Unit, UnitAdmin)
+admin_site.register(models.Unit, UnitAdmin)
class IdentificationTypeAdmin(admin.ModelAdmin):
list_display = ['label', 'txt_idx', 'available', 'order', 'comment']
-admin.site.register(models.IdentificationType, IdentificationTypeAdmin)
+admin_site.register(models.IdentificationType, IdentificationTypeAdmin)
general_models = [
models.DatingType, models.DatingQuality, models.DocumentationType,
models.ActivityType, models.ExcavationTechnicType]
for model in general_models:
- admin.site.register(model, GeneralTypeAdmin)
+ admin_site.register(model, GeneralTypeAdmin)
diff --git a/archaeological_files/__init__.py b/archaeological_files/__init__.py
index e69de29bb..b1a1e04d1 100644
--- a/archaeological_files/__init__.py
+++ b/archaeological_files/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'apps.ArchaeologicalFilesConfig'
diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py
index 9e1f56392..f341dec41 100644
--- a/archaeological_files/admin.py
+++ b/archaeological_files/admin.py
@@ -18,8 +18,8 @@
# See the file COPYING for details.
from django.conf import settings
-from django.contrib import admin
+from ishtar_common.apps import admin_site
from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -34,10 +34,10 @@ class FileAdmin(HistorizedObjectAdmin):
search_fields = ('towns__name',)
model = models.File
-admin.site.register(models.File, FileAdmin)
+admin_site.register(models.File, FileAdmin)
general_models = [models.FileType, models.PermitType]
if settings.COUNTRY == 'fr':
general_models.append(models.SaisineType)
for model in general_models:
- admin.site.register(model, GeneralTypeAdmin)
+ admin_site.register(model, GeneralTypeAdmin)
diff --git a/archaeological_finds/__init__.py b/archaeological_finds/__init__.py
index e69de29bb..42c74e66d 100644
--- a/archaeological_finds/__init__.py
+++ b/archaeological_finds/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'ishtar_common.apps.ArchaeologicalFindsConfig'
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 8fd168316..9727e9d0e 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -19,6 +19,7 @@
from django.contrib import admin
+from ishtar_common.apps import admin_site
from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -29,7 +30,7 @@ class BaseFindAdmin(HistorizedObjectAdmin):
search_fields = ('label', 'context_record__parcel__operation__name',)
model = models.BaseFind
-admin.site.register(models.BaseFind, BaseFindAdmin)
+admin_site.register(models.BaseFind, BaseFindAdmin)
class FindAdmin(HistorizedObjectAdmin):
@@ -38,7 +39,7 @@ class FindAdmin(HistorizedObjectAdmin):
search_fields = ('label', "datings__period__label")
model = models.Find
-admin.site.register(models.Find, FindAdmin)
+admin_site.register(models.Find, FindAdmin)
class FindSourceAdmin(admin.ModelAdmin):
@@ -47,7 +48,7 @@ class FindSourceAdmin(admin.ModelAdmin):
search_fields = ('title', )
model = models.FindSource
-admin.site.register(models.FindSource, FindSourceAdmin)
+admin_site.register(models.FindSource, FindSourceAdmin)
class PropertyAdmin(admin.ModelAdmin):
@@ -55,14 +56,14 @@ class PropertyAdmin(admin.ModelAdmin):
search_fields = ('find__label', 'person__name')
model = models.Property
-admin.site.register(models.Property, PropertyAdmin)
+admin_site.register(models.Property, PropertyAdmin)
class TreatmentAdmin(HistorizedObjectAdmin):
list_display = ('location', 'treatment_types_lbl', 'container', 'person')
model = models.Treatment
-admin.site.register(models.Treatment, TreatmentAdmin)
+admin_site.register(models.Treatment, TreatmentAdmin)
class TreatmentFileAdmin(HistorizedObjectAdmin):
@@ -70,7 +71,7 @@ class TreatmentFileAdmin(HistorizedObjectAdmin):
search_fields = ('cached_label',)
model = models.TreatmentFile
-admin.site.register(models.TreatmentFile, TreatmentFileAdmin)
+admin_site.register(models.TreatmentFile, TreatmentFileAdmin)
class TreatmentSourceAdmin(admin.ModelAdmin):
@@ -79,27 +80,27 @@ class TreatmentSourceAdmin(admin.ModelAdmin):
search_fields = ('title',)
model = models.TreatmentSource
-admin.site.register(models.TreatmentSource, TreatmentSourceAdmin)
+admin_site.register(models.TreatmentSource, TreatmentSourceAdmin)
class HierarchicalTypeAdmin(GeneralTypeAdmin):
list_display = ['label', 'txt_idx', 'parent', 'available', 'comment']
-admin.site.register(models.ObjectType, HierarchicalTypeAdmin)
+admin_site.register(models.ObjectType, HierarchicalTypeAdmin)
class MaterialTypeAdmin(HierarchicalTypeAdmin):
list_display = HierarchicalTypeAdmin.list_display + ['recommendation']
search_fields = ('label', 'parent__label', 'comment',)
-admin.site.register(models.MaterialType, MaterialTypeAdmin)
+admin_site.register(models.MaterialType, MaterialTypeAdmin)
class TreatmentTypeAdmin(admin.ModelAdmin):
list_display = HierarchicalTypeAdmin.list_display + [
'order', 'virtual', 'upstream_is_many', 'downstream_is_many']
model = models.TreatmentType
-admin.site.register(models.TreatmentType, TreatmentTypeAdmin)
+admin_site.register(models.TreatmentType, TreatmentTypeAdmin)
general_models = [
models.ConservatoryState, models.RemarkabilityType,
@@ -108,4 +109,4 @@ general_models = [
models.BatchType
]
for model in general_models:
- admin.site.register(model, GeneralTypeAdmin)
+ admin_site.register(model, GeneralTypeAdmin)
diff --git a/archaeological_operations/__init__.py b/archaeological_operations/__init__.py
index e69de29bb..fe4502bb1 100644
--- a/archaeological_operations/__init__.py
+++ b/archaeological_operations/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'ishtar_common.apps.ArchaeologicalOperationsConfig'
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index 3abf22eae..85df96f6e 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -20,6 +20,7 @@
from django.conf import settings
from django.contrib import admin
+from ishtar_common.apps import admin_site
from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -36,7 +37,7 @@ class AdministrativeActAdmin(HistorizedObjectAdmin):
'history_modifier', 'history_creator')
model = models.AdministrativeAct
-admin.site.register(models.AdministrativeAct, AdministrativeActAdmin)
+admin_site.register(models.AdministrativeAct, AdministrativeActAdmin)
class PeriodAdmin(admin.ModelAdmin):
@@ -45,7 +46,7 @@ class PeriodAdmin(admin.ModelAdmin):
list_filter = ('parent',)
model = models.Period
-admin.site.register(models.Period, PeriodAdmin)
+admin_site.register(models.Period, PeriodAdmin)
class ArchaeologicalSiteAdmin(HistorizedObjectAdmin):
@@ -53,7 +54,7 @@ class ArchaeologicalSiteAdmin(HistorizedObjectAdmin):
search_fields = ('name', 'reference')
model = models.ArchaeologicalSite
-admin.site.register(models.ArchaeologicalSite, ArchaeologicalSiteAdmin)
+admin_site.register(models.ArchaeologicalSite, ArchaeologicalSiteAdmin)
class OperationAdmin(HistorizedObjectAdmin):
@@ -67,7 +68,7 @@ class OperationAdmin(HistorizedObjectAdmin):
search_fields += ['code_patriarche']
model = models.Operation
-admin.site.register(models.Operation, OperationAdmin)
+admin_site.register(models.Operation, OperationAdmin)
class OperationSourceAdmin(admin.ModelAdmin):
@@ -76,7 +77,7 @@ class OperationSourceAdmin(admin.ModelAdmin):
search_fields = ('title', 'operation__common_name')
model = models.OperationSource
-admin.site.register(models.OperationSource, OperationSourceAdmin)
+admin_site.register(models.OperationSource, OperationSourceAdmin)
class ParcelAdmin(HistorizedObjectAdmin):
@@ -84,40 +85,40 @@ class ParcelAdmin(HistorizedObjectAdmin):
search_fields = ('operation__name',)
model = models.Parcel
-admin.site.register(models.Parcel, ParcelAdmin)
+admin_site.register(models.Parcel, ParcelAdmin)
class RecordRelationsAdmin(admin.ModelAdmin):
list_display = ('left_record', 'relation_type', 'right_record')
list_filter = ('relation_type',)
-admin.site.register(models.RecordRelations, RecordRelationsAdmin)
+admin_site.register(models.RecordRelations, RecordRelationsAdmin)
class RelationTypeAdmin(admin.ModelAdmin):
list_display = ('label', 'txt_idx', 'tiny_label', 'available',
'symmetrical', 'inverse_relation', 'comment')
-admin.site.register(models.RelationType, RelationTypeAdmin)
+admin_site.register(models.RelationType, RelationTypeAdmin)
class ActTypeAdmin(GeneralTypeAdmin):
list_filter = ('intented_to',)
list_display = ['label', 'txt_idx', 'available', 'intented_to']
-admin.site.register(models.ActType, ActTypeAdmin)
+admin_site.register(models.ActType, ActTypeAdmin)
class ReportStateAdmin(GeneralTypeAdmin):
list_display = ['label', 'txt_idx', 'available', 'order', 'comment']
-admin.site.register(models.ReportState, ReportStateAdmin)
+admin_site.register(models.ReportState, ReportStateAdmin)
general_models = [models.RemainType]
for model in general_models:
- admin.site.register(model, GeneralTypeAdmin)
+ admin_site.register(model, GeneralTypeAdmin)
basic_models = [models.ParcelOwner]
for model in basic_models:
- admin.site.register(model)
+ admin_site.register(model)
diff --git a/archaeological_warehouse/__init__.py b/archaeological_warehouse/__init__.py
index e69de29bb..7a5abf267 100644
--- a/archaeological_warehouse/__init__.py
+++ b/archaeological_warehouse/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'ishtar_common.apps.ArchaeologicalWarehouseConfig'
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py
index 911809d0f..723935547 100644
--- a/archaeological_warehouse/admin.py
+++ b/archaeological_warehouse/admin.py
@@ -19,6 +19,7 @@
from django.contrib import admin
+from ishtar_common.apps import admin_site
from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
import models
@@ -30,7 +31,7 @@ class WarehouseAdmin(HistorizedObjectAdmin):
search_fields = ('name', 'town')
model = models.Warehouse
-admin.site.register(models.Warehouse, WarehouseAdmin)
+admin_site.register(models.Warehouse, WarehouseAdmin)
class ContainerTypeAdmin(admin.ModelAdmin):
@@ -38,7 +39,7 @@ class ContainerTypeAdmin(admin.ModelAdmin):
'volume')
model = models.ContainerType
-admin.site.register(models.ContainerType, ContainerTypeAdmin)
+admin_site.register(models.ContainerType, ContainerTypeAdmin)
class ContainerAdmin(admin.ModelAdmin):
@@ -46,8 +47,8 @@ class ContainerAdmin(admin.ModelAdmin):
list_filter = ("container_type",)
model = models.Container
-admin.site.register(models.Container, ContainerAdmin)
+admin_site.register(models.Container, ContainerAdmin)
general_models = [models.WarehouseType, models.WarehouseDivision]
for model in general_models:
- admin.site.register(model, GeneralTypeAdmin)
+ admin_site.register(model, GeneralTypeAdmin)
diff --git a/example_project/urls.py b/example_project/urls.py
index 0e138eb8e..8bc2a5f31 100644
--- a/example_project/urls.py
+++ b/example_project/urls.py
@@ -2,8 +2,9 @@ from django.conf import settings
from django.conf.urls import patterns, include, url
from django.contrib import admin
+from ishtar_common.apps import admin_site
+
admin.autodiscover()
-# admin.site.unregister(User)
urlpatterns = patterns(
@@ -28,7 +29,7 @@ urlpatterns += patterns(
)
urlpatterns += patterns(
- '', (r'^admin/', include(admin.site.urls)),
+ '', (r'^admin/', include(admin_site.urls)),
)
if settings.DEBUG:
diff --git a/ishtar_common/__init__.py b/ishtar_common/__init__.py
index 2b432d908..6ae20f3c8 100644
--- a/ishtar_common/__init__.py
+++ b/ishtar_common/__init__.py
@@ -8,3 +8,5 @@ from django.utils.translation import ugettext_lazy as _
_(u"username")
_(u"email address")
_(u"Related item")
+
+default_app_config = 'ishtar_common.apps.IshtarCommonConfig'
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 9f8265033..494fc3ac9 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -24,8 +24,8 @@ import csv
from django.conf import settings
from django.contrib import admin
-from django.contrib.auth.admin import GroupAdmin
-from django.contrib.auth.models import Group
+from django.contrib.auth.admin import GroupAdmin, UserAdmin
+from django.contrib.auth.models import Group, User
from django.http import HttpResponseRedirect, HttpResponse
from django.shortcuts import render_to_response
from django.template import RequestContext
@@ -34,7 +34,8 @@ from django.utils.translation import ugettext_lazy as _, ugettext
from django import forms
-import models
+from ishtar_common.apps import admin_site
+from ishtar_common import models
class ImportGenericForm(forms.Form):
@@ -127,8 +128,8 @@ class MyGroupAdmin(GroupAdmin):
"all": ("media/admin.css",)
}
-admin.site.unregister(Group)
-admin.site.register(Group, MyGroupAdmin)
+admin_site.register(User, UserAdmin)
+admin_site.register(Group, MyGroupAdmin)
class IshtarSiteProfileAdmin(admin.ModelAdmin):
@@ -136,14 +137,14 @@ class IshtarSiteProfileAdmin(admin.ModelAdmin):
'find', 'warehouse')
model = models.IshtarSiteProfile
-admin.site.register(models.IshtarSiteProfile, IshtarSiteProfileAdmin)
+admin_site.register(models.IshtarSiteProfile, IshtarSiteProfileAdmin)
class DepartmentAdmin(admin.ModelAdmin):
list_display = ('number', 'label',)
model = models.Department
-admin.site.register(models.Department, DepartmentAdmin)
+admin_site.register(models.Department, DepartmentAdmin)
class OrganizationAdmin(HistorizedObjectAdmin):
@@ -153,7 +154,7 @@ class OrganizationAdmin(HistorizedObjectAdmin):
exclude = ('merge_key', 'merge_exclusion', 'merge_candidate', )
model = models.Organization
-admin.site.register(models.Organization, OrganizationAdmin)
+admin_site.register(models.Organization, OrganizationAdmin)
class PersonAdmin(HistorizedObjectAdmin):
@@ -163,7 +164,7 @@ class PersonAdmin(HistorizedObjectAdmin):
exclude = ('merge_key', 'merge_exclusion', 'merge_candidate', )
model = models.Person
-admin.site.register(models.Person, PersonAdmin)
+admin_site.register(models.Person, PersonAdmin)
class TownAdmin(admin.ModelAdmin):
@@ -175,7 +176,7 @@ class TownAdmin(admin.ModelAdmin):
list_filter = ("departement",)
model = models.Town
-admin.site.register(models.Town, TownAdmin)
+admin_site.register(models.Town, TownAdmin)
class AuthorAdmin(admin.ModelAdmin):
@@ -183,7 +184,7 @@ class AuthorAdmin(admin.ModelAdmin):
list_filter = ("author_type",)
model = models.Author
-admin.site.register(models.Author, AuthorAdmin)
+admin_site.register(models.Author, AuthorAdmin)
class PersonTypeAdmin(admin.ModelAdmin):
@@ -191,12 +192,12 @@ class PersonTypeAdmin(admin.ModelAdmin):
model = models.PersonType
filter_vertical = ('groups',)
-admin.site.register(models.PersonType, PersonTypeAdmin)
+admin_site.register(models.PersonType, PersonTypeAdmin)
class GlobalVarAdmin(admin.ModelAdmin):
list_display = ['slug', 'description', 'value']
-admin.site.register(models.GlobalVar, GlobalVarAdmin)
+admin_site.register(models.GlobalVar, GlobalVarAdmin)
class GeneralTypeAdmin(admin.ModelAdmin):
@@ -210,7 +211,7 @@ general_models = [models.OrganizationType, models.SourceType,
models.AuthorType, models.TitleType, models.Format,
models.SupportType]
for model in general_models:
- admin.site.register(model, GeneralTypeAdmin)
+ admin_site.register(model, GeneralTypeAdmin)
class ImporterDefaultValuesInline(admin.TabularInline):
@@ -221,17 +222,17 @@ class ImporterDefaultAdmin(admin.ModelAdmin):
list_display = ('importer_type', 'target')
model = models.ImporterDefault
inlines = (ImporterDefaultValuesInline,)
-admin.site.register(models.ImporterDefault, ImporterDefaultAdmin)
+admin_site.register(models.ImporterDefault, ImporterDefaultAdmin)
class ImporterTypeAdmin(admin.ModelAdmin):
list_display = ('name', 'associated_models', 'is_template')
-admin.site.register(models.ImporterType, ImporterTypeAdmin)
+admin_site.register(models.ImporterType, ImporterTypeAdmin)
class RegexpAdmin(admin.ModelAdmin):
list_display = ('name', 'description', "regexp")
-admin.site.register(models.Regexp, RegexpAdmin)
+admin_site.register(models.Regexp, RegexpAdmin)
class ImporterDuplicateFieldInline(admin.TabularInline):
@@ -258,25 +259,25 @@ class ImporterColumnAdmin(admin.ModelAdmin):
'targets_lbl', 'duplicate_fields_lbl', 'required')
list_filter = ('importer_type',)
inlines = (ImportTargetInline, ImporterDuplicateFieldInline)
-admin.site.register(models.ImporterColumn, ImporterColumnAdmin)
+admin_site.register(models.ImporterColumn, ImporterColumnAdmin)
class ImporterModelAdmin(admin.ModelAdmin):
list_display = ('name', 'klass')
model = models.ImporterModel
-admin.site.register(models.ImporterModel, ImporterModelAdmin)
+admin_site.register(models.ImporterModel, ImporterModelAdmin)
class FormaterTypeAdmin(admin.ModelAdmin):
list_display = ('formater_type', 'options')
-admin.site.register(models.FormaterType, FormaterTypeAdmin)
+admin_site.register(models.FormaterType, FormaterTypeAdmin)
class ImportAdmin(admin.ModelAdmin):
list_display = ('name', 'importer_type', 'imported_file', 'user', 'state',
'creation_date')
-admin.site.register(models.Import, ImportAdmin)
+admin_site.register(models.Import, ImportAdmin)
class TargetKeyAdmin(admin.ModelAdmin):
@@ -284,26 +285,26 @@ class TargetKeyAdmin(admin.ModelAdmin):
'value', 'is_set')
list_filter = ("is_set", "target__column__importer_type")
search_fields = ('target__target', 'value', 'key')
-admin.site.register(models.TargetKey, TargetKeyAdmin)
+admin_site.register(models.TargetKey, TargetKeyAdmin)
class OperationTypeAdmin(GeneralTypeAdmin):
list_display = GeneralTypeAdmin.list_display + ['order', 'preventive']
model = models.OperationType
-admin.site.register(models.OperationType, OperationTypeAdmin)
+admin_site.register(models.OperationType, OperationTypeAdmin)
class SpatialReferenceSystemAdmin(GeneralTypeAdmin):
list_display = GeneralTypeAdmin.list_display + ['order', 'srid']
model = models.SpatialReferenceSystem
-admin.site.register(models.SpatialReferenceSystem, SpatialReferenceSystemAdmin)
+admin_site.register(models.SpatialReferenceSystem, SpatialReferenceSystemAdmin)
class ItemKeyAdmin(admin.ModelAdmin):
list_display = ('content_type', 'key', 'content_object', 'importer')
search_fields = ('key', )
-admin.site.register(models.ItemKey, ItemKeyAdmin)
+admin_site.register(models.ItemKey, ItemKeyAdmin)
class AdministrationScriptAdmin(admin.ModelAdmin):
@@ -314,7 +315,7 @@ class AdministrationScriptAdmin(admin.ModelAdmin):
return ('path',)
return []
-admin.site.register(models.AdministrationScript, AdministrationScriptAdmin)
+admin_site.register(models.AdministrationScript, AdministrationScriptAdmin)
class AdministrationTaskAdmin(admin.ModelAdmin):
@@ -329,7 +330,7 @@ class AdministrationTaskAdmin(admin.ModelAdmin):
return ("script", ) + self.readonly_fields
return self.readonly_fields
-admin.site.register(models.AdministrationTask, AdministrationTaskAdmin)
+admin_site.register(models.AdministrationTask, AdministrationTaskAdmin)
basic_models = [models.DocumentTemplate, models.IshtarUser]
@@ -337,4 +338,4 @@ if settings.COUNTRY == 'fr':
basic_models += [models.Arrondissement, models.Canton]
for model in basic_models:
- admin.site.register(model)
+ admin_site.register(model)
diff --git a/ishtar_common/apps.py b/ishtar_common/apps.py
new file mode 100644
index 000000000..9e970d274
--- /dev/null
+++ b/ishtar_common/apps.py
@@ -0,0 +1,41 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+from django.contrib.admin import AdminSite
+from django.utils.translation import ugettext_lazy as _
+
+
+class IshtarAdminSite(AdminSite):
+ site_header = 'Ishtar administration'
+
+admin_site = IshtarAdminSite(name='ishtaradmin')
+
+
+class ArchaeologicalContextRecordConfig(AppConfig):
+ name = 'archaeological_context_records'
+ verbose_name = _("Ishtar - Context record")
+
+
+class ArchaeologicalFilesConfig(AppConfig):
+ name = 'archaeological_files'
+ verbose_name = _("Ishtar - File")
+
+
+class ArchaeologicalFindsConfig(AppConfig):
+ name = 'archaeological_finds'
+ verbose_name = _("Ishtar - Find")
+
+
+class ArchaeologicalOperationsConfig(AppConfig):
+ name = 'archaeological_operations'
+ verbose_name = _("Ishtar - Operation")
+
+
+class ArchaeologicalWarehouseConfig(AppConfig):
+ name = 'archaeological_warehouse'
+ verbose_name = _("Ishtar - Warehouse")
+
+
+class IshtarCommonConfig(AppConfig):
+ name = 'ishtar_common'
+ verbose_name = _("Ishtar - Common")
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 09:26:26 +0000