Merge branch 'develop' into develop-bootstrap

2 files changed, 45 insertions, 9 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 7cb02e1b3..2df910ffd 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -123,6 +123,16 @@ class HistorizedObjectAdmin(admin.ModelAdmin):
         obj.history_modifier = request.user
         obj.save()
 
+    def get_readonly_fields(self, request, obj=None):
+        if obj:  # editing an existing object
+            return tuple(self.readonly_fields or []) + tuple(['imports'])
+        return self.readonly_fields
+
+    def get_exclude(self, request, obj=None):
+        if not obj:
+            return tuple(self.exclude or []) + tuple(['imports'])
+        return self.exclude
+
 
 class MyGroupAdmin(GroupAdmin):
     class Media:
@@ -156,7 +166,6 @@ class OrganizationAdmin(HistorizedObjectAdmin):
     list_filter = ("organization_type",)
     search_fields = ('name',)
     exclude = ('merge_key', 'merge_exclusion', 'merge_candidate', )
-    readonly_fields = HistorizedObjectAdmin.readonly_fields + ['imports']
     model = models.Organization
 
 admin_site.register(models.Organization, OrganizationAdmin)
@@ -167,7 +176,6 @@ class PersonAdmin(HistorizedObjectAdmin):
     list_filter = ("person_types",)
     search_fields = ('name', 'surname', 'email', 'raw_name')
     exclude = ('merge_key', 'merge_exclusion', 'merge_candidate', )
-    readonly_fields = HistorizedObjectAdmin.readonly_fields + ['imports']
     form = make_ajax_form(models.Person, {'attached_to': 'organization'})
     model = models.Person
 
@@ -185,7 +193,7 @@ class AdminRelatedTownForm(forms.ModelForm):
 class AdminTownForm(forms.ModelForm):
     class Meta:
         model = models.Town
-        exclude = []
+        exclude = ['imports']
     center = PointField(label=_(u"center"), required=False,
                         widget=OSMWidget)
     children = AutoCompleteSelectMultipleField('town', required=False,
@@ -202,14 +210,14 @@ class TownParentInline(admin.TabularInline):
 
 
 class TownAdmin(admin.ModelAdmin):
+    model = models.Town
     list_display = ['name', ]
     search_fields = ['name']
+    readonly_fields = ['cached_label']
     if settings.COUNTRY == 'fr':
         list_display += ['numero_insee', 'departement', ]
         search_fields += ['numero_insee', 'departement__label', ]
         list_filter = ("departement",)
-    readonly_fields = ['cached_label', 'imports']
-    model = models.Town
     form = AdminTownForm
     inlines = [TownParentInline]
 
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 8a951b29a..bbb449fe3 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -23,6 +23,8 @@ import os
 import shutil
 from StringIO import StringIO
 
+from django.apps import apps
+
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
@@ -38,6 +40,7 @@ from django.test.runner import DiscoverRunner
 
 from ishtar_common import models
 from ishtar_common import views
+from ishtar_common.apps import admin_site
 from ishtar_common.utils import post_save_point
 
 
@@ -347,6 +350,13 @@ class AdminGenTypeTest(TestCase):
     models_with_data = gen_models + [models.ImporterModel]
     models = models_with_data
     module_name = 'ishtar_common'
+    ishtar_apps = [
+        'ishtar_common', 'archaeological_files', 'archaeological_operations',
+        'archaeological_context_records', 'archaeological_warehouse',
+        'archaeological_finds'
+    ]
+    readonly_models = ['archaeological_finds.Property',
+                       'archaeological_finds.Treatment']
 
     def setUp(self):
         self.password = 'mypassword'
@@ -359,16 +369,34 @@ class AdminGenTypeTest(TestCase):
         self.client.login(username=self.username, password=self.password)
 
     def test_listing_and_detail(self):
-        for model in self.models:
+        models = []
+        for app in self.ishtar_apps:
+            app_models = apps.get_app_config(app).get_models()
+            for model in app_models:
+                if model in admin_site._registry:
+                    models.append((app, model))
+        for app, model in models:
             # quick test to verify basic access to listing
-            base_url = '/admin/{}/{}/'.format(self.module_name,
-                                              model.__name__.lower())
+            base_url = '/admin/{}/{}/'.format(app, model.__name__.lower())
             url = base_url
             response = self.client.get(url)
             self.assertEqual(
                 response.status_code, 200,
                 msg="Can not access admin list for {}.".format(model))
-            if model in self.models_with_data:
+            nb = model.objects.count()
+            url = base_url + "add/"
+            response = self.client.get(url)
+            if app + "." + model.__name__ in self.readonly_models:
+                continue
+            self.assertEqual(
+                response.status_code, 200,
+                msg="Can not access admin add page for {}.".format(model))
+            self.assertEqual(
+                nb, model.objects.count(),
+                msg="A ghost object have been created on access to add page "
+                    "for {}.".format(model))
+
+            if nb:
                 url = base_url + "{}/change/".format(model.objects.all()[0].pk)
                 response = self.client.get(url)
                 self.assertEqual(