make the resource field view generic, fix related media edit style

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index d33132739ec0fe0f21edfe799d68f13b91031056..44b6b086af423fa495fccf8603a461f67989b106 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -1255,4 +1255,6 @@ input,textarea{
     outline: none !important;
 }
 
-
+.related_media {
+    border-top: 1px dotted #6a0307;
+}

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index bae4bfb612cf62f75c338d148dc4c358473c4f66..8378896b29c4974132447443991b31e1b45b1088 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -106,6 +106,9 @@ class MediaBaseResource(MediaResource):
     def save(self, force_insert=False, force_update=False, user=None, code=None):
         super(MediaBaseResource, self).save(force_insert, force_update)
 
+    def get_fields(self):
+        return MediaBaseResource._meta.fields
+        
     class Meta(MetaCore):
         abstract = True
         ordering = ['code']

diff --git a/telemeta/templates/telemeta/collection_related_edit.html b/telemeta/templates/telemeta/collection_related_edit.html
index 4dd6b8cd0d78aed90f22806485a431d32977e41b..6f689e9579f2163c5676f3100063f1959a95b0e8 100644 (file)
--- a/telemeta/templates/telemeta/collection_related_edit.html
+++ b/telemeta/templates/telemeta/collection_related_edit.html
@@ -19,8 +19,7 @@
 
     {{ formset.management_form }}
     {% for form in formset.forms %}
-      <hr>
-      <table>
+      <table class="related_media">
         <tr><td><b>{% trans "Media" %} :</b><td></td></tr>
         {% for field in form %}
         <tr><td class="error">{{ field.errors }}</td></tr>

diff --git a/telemeta/templates/telemeta/mediaitem_related_edit.html b/telemeta/templates/telemeta/mediaitem_related_edit.html
index 506d279e5d25f97aa44f485dae5f9bc41fe2d1d0..c954c78bce79011c1448fc5123347390737878d8 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_related_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_related_edit.html
@@ -19,8 +19,7 @@
 
     {{ formset.management_form }}
     {% for form in formset.forms %}
-      <hr>
-      <table>
+      <table class="related_media">
         <tr><td><b>{% trans "Media" %} :</b><td></td></tr>
         {% for field in form %}
         <tr><td class="error">{{ field.errors }}</td></tr>

diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index 7eba63820f27a4f58c401091b0482b402f10c53d..929cbc94ed8b73d7a034df9e95baf5b33253bb7a 100644 (file)
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -36,10 +36,9 @@
         <div class="infos">
         {% block general_info %}
             <dl class="listing">
-                {% dl_field resource "reference" %}
-                {% dl_field resource "title"  %}
-                {% dl_field resource "description" %}
-                {% dl_field resource "code" %}
+              {% for field in resource.get_fields %}
+                {% dl_field resource field.name %}
+              {% endfor %}  
             </dl>
         {% endblock general_info %}
 

diff --git a/telemeta/templates/telemeta/resource_related_edit.html b/telemeta/templates/telemeta/resource_related_edit.html
index 35c4afc963e207ef9f9c9c86a349c48f79182dd0..a0065ddab96e89eb15f06739a27e4a1956eb4ad9 100644 (file)
--- a/telemeta/templates/telemeta/resource_related_edit.html
+++ b/telemeta/templates/telemeta/resource_related_edit.html
@@ -19,8 +19,7 @@
 
     {{ formset.management_form }}
     {% for form in formset.forms %}
-      <hr>
-      <table>
+      <table class="related_media">
         <tr><td><b>{% trans "Media" %} :</b><td></td></tr>
         {% for field in form %}
         <tr><td class="error">{{ field.errors }}</td></tr>

diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index 193f27edea4f2fbd823179a65855555da5b47a52..1a66c58c5770df94abb30236b2f4bdf318081b82 100644 (file)
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -204,8 +204,6 @@ def auto_code(resources, base_code):
         r = resources.filter(code=code)
         if not r:
             break
-        if index == 100:
-            break
         index += 1
     return code
 
@@ -1420,7 +1418,6 @@ class ResourceView(object):
         resource = self.model.objects.get(code=public_id)
         children = resource.children.all()
         children = children.order_by('code')
-
         related_media = self.related.objects.filter(resource=resource)
         check_related_media(related_media)