From 4329d24af2e3fc965ff17831649a19cbaec9be7b Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 31 Jan 2012 01:00:37 +0100
Subject: [PATCH] make the resource field view generic, fix related media edit
 style

---
 telemeta/htdocs/css/telemeta.css                         | 4 +++-
 telemeta/models/media.py                                 | 3 +++
 telemeta/templates/telemeta/collection_related_edit.html | 3 +--
 telemeta/templates/telemeta/mediaitem_related_edit.html  | 3 +--
 telemeta/templates/telemeta/resource_detail.html         | 7 +++----
 telemeta/templates/telemeta/resource_related_edit.html   | 3 +--
 telemeta/views/base.py                                   | 3 ---
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index d3313273..44b6b086 100644
--- 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 bae4bfb6..8378896b 100644
--- 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 4dd6b8cd..6f689e95 100644
--- 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 506d279e..c954c78b 100644
--- 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 7eba6382..929cbc94 100644
--- 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 35c4afc9..a0065dda 100644
--- 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 193f27ed..1a66c58c 100644
--- 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)
 
-- 
2.39.5