Customize the administration labels

1 files changed, 29 insertions, 28 deletions

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)