added object method to templates

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@492 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 53feab10b1f1b88cc1662e66ff19f679f27ad2fa..b8304b01a3a731c3d4cc3caabf8cf1c7f9fb3766 100644 (file)
--- a/Changes
+++ b/Changes
@@ -59,6 +59,7 @@ API additions and enhancements:
        - Improved factory templates
         - added the status() attribute, although it's not used in many places 
             yet
+       - Changed factory edit/view to use object instead of objects
      Maypole::Model::CDBI
        - improved error messages in do_edit action
 

diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index f634ca8fedb7604ef9d97af249bcfc738f746bd7..a1484d5eab77a2b030f230c0e322cb1a2ef8508a 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -57,7 +57,7 @@ sub report_error {
       $r->{config} ||= {};
     }
     if ($tt->process(\$error_template,
-                    { err_type => $type, error => $error, 
+                    { err_type => $type, error => $error,
                       config => $r->{config},
                       request => $r,
         eval{$self->vars($r)} }, \$output )) {

diff --git a/lib/Maypole/templates/factory/edit b/lib/Maypole/templates/factory/edit
index 14f77be3c172e46eaa3233ee31339bf6d6cd230e..2016bb1215f2cce7b0776c1bae4fce8344de4d33 100644 (file)
--- a/lib/Maypole/templates/factory/edit
+++ b/lib/Maypole/templates/factory/edit
@@ -16,17 +16,16 @@ form similar to L<addnew> but with the current values filled in.
 [% INCLUDE navbar %]
 [% END %]
 
-[% IF objects.size %]
+[% IF object %]
 <div id="title">Edit a [% classmetadata.moniker %]</div>
-[% FOR item = objects; %]
 <form action="[% base %]/[% item.table %]/do_edit/[% item.id %]" method="post">
 <fieldset>
-<legend>Edit [% item.name %]</legend>
-[% FOR col = classmetadata.columns;
+<legend>Edit [% object.name %]</legend>
+   [% FOR col = classmetadata.columns;
     NEXT IF col == "id" OR col == classmetadata.table _ "_id";
     '<label><span class="field">';
     classmetadata.colnames.$col; ":</span>";
-    item.to_field(col).as_XML;
+    object.to_field(col).as_XML;
     "</label>";
     IF errors.$col; 
        '<span class="error">'; errors.$col;'</span>';
@@ -36,7 +35,6 @@ form similar to L<addnew> but with the current values filled in.
     <input type="hidden" name="__form_id" value="[% request.make_random_id %]">
     </fieldset></form>
     
-    [% END %]
 [% ELSE %]
 
 <div id="addnew">

diff --git a/lib/Maypole/templates/factory/view b/lib/Maypole/templates/factory/view
index 328678c73d98c86d84d5be888540b756e4881c25..9f06086944dbe5ecff37e23f626a0ecd0798a606 100644 (file)
--- a/lib/Maypole/templates/factory/view
+++ b/lib/Maypole/templates/factory/view
@@ -10,8 +10,7 @@ C<objects> and displays the object's properties in a table.
 #%]
 [% PROCESS macros %]
 [% INCLUDE header %]
-[% FOR item = objects %]
-[% view_item(item); %]
+[% view_item(object); %]
 [%#
 
 =for doc
@@ -23,12 +22,11 @@ a list of has-many accessors. Next it calls each of those accessors, and
 displays the results in a table.
 
 #%]
-    <br /><a href="[%base%]/[%item.table%]/list">Back to listing</a>
-[% view_related(item); %]
+    <br /><a href="[%base%]/[%object.table%]/list">Back to listing</a>
+[% view_related(object); %]
     
 [%
-    button(item, "edit");
-    button(item, "delete");
+    button(object, "edit");
+    button(object, "delete");
 %]
-[% END; %]
 [% INCLUDE footer %]