From beb45ac4d420034f9aec53eaf7ea783e178d5361 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Sat, 20 Oct 2012 15:25:07 +0200
Subject: Djangoization - Major refactoring (step 3)

Reorganization of views, urls, menus, admin, forms.
Changes on models.
---
 ishtar_common/templates/sheet_contextrecord.html | 10 +++++-----
 ishtar_common/templates/sheet_operation.html     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/sheet_contextrecord.html b/ishtar_common/templates/sheet_contextrecord.html
index c2b94bafe..806b06288 100644
--- a/ishtar_common/templates/sheet_contextrecord.html
+++ b/ishtar_common/templates/sheet_contextrecord.html
@@ -109,7 +109,7 @@
     <th>{% trans "Parcel" %}</th>
     <th class='link'>&nbsp;</th>
   </tr>
-  {% for find in item.base_items.all %}
+  {% for find in item.base_finds.all %}
   <tr>
     <td>{{ find.full_label }}</td>
 {# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #}
@@ -119,10 +119,10 @@
 {# or displayed as (Year)-(index)-(Record unit label)-(material code)-(Finds label indexed by material type) #}
 
     <td class='string'>{{find.context_record}}</td>
-    <td>{{ find.get_last_item.dating}}</td>{# TODO .all|join:", " ? #}
-    <td>{{ find.get_last_item.description }}</td>
-    <td>{{ find.get_last_item.weight }}</td>
-    <td>{{ find.get_last_item.item_number }}</td>
+    <td>{{ find.get_last_find.dating}}</td>{# TODO .all|join:", " ? #}
+    <td>{{ find.get_last_find.description }}</td>
+    <td>{{ find.get_last_find.weight }}</td>
+    <td>{{ find.get_last_find.item_number }}</td>
     <td>{{ item.context_record.parcel.short_label }}</td>
     <td class='link'><a href="#">{% trans "Details" %}</a></td>
     {#<a href="#" onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#}
diff --git a/ishtar_common/templates/sheet_operation.html b/ishtar_common/templates/sheet_operation.html
index aa571d20c..edceca989 100644
--- a/ishtar_common/templates/sheet_operation.html
+++ b/ishtar_common/templates/sheet_operation.html
@@ -156,17 +156,17 @@
     <th class='link'>&nbsp;</th>
   </tr>
   {% for context_record in item.context_record.all %}
-  {% for find in context_record.base_items.all %}
+  {% for find in context_record.base_finds.all %}
   <tr>
     <td class="ref">{{ find.full_label }}</td>
 {# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #}
 {# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #}
     <td class="ref">{{ find.material_type_label }}</td>
     <td>{{find.context_record.label}}</td>
-    <td class='string'>{{ find.get_last_item.dating}}</td>{# TODO .all|join:", " ? #}
-    <td class='string'>{{ find.get_last_item.description }}</td>
-    <td>{{ find.get_last_item.weight }}</td>
-    <td>{{ find.get_last_item.item_number }}</td>
+    <td class='string'>{{ find.get_last_find.dating}}</td>{# TODO .all|join:", " ? #}
+    <td class='string'>{{ find.get_last_find.description }}</td>
+    <td>{{ find.get_last_find.weight }}</td>
+    <td>{{ find.get_last_find.item_number }}</td>
     <td class="ref">{{ context_record.parcel.short_label }}</td>
     <td class='link'><a href="#">{% trans "Details" %}</a></td>
     {#<a href="#" onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#}
-- 
cgit v1.2.3