Use table instead of moniker.

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

diff --git a/templates/factory/addnew b/templates/factory/addnew
index 56e794b095c2fb208327e2fc08b6dd747bd904d3..cdf21a67a994452f08705c8839752af40a1039ec 100644 (file)
--- a/templates/factory/addnew
+++ b/templates/factory/addnew
@@ -11,9 +11,8 @@ table.
 
 #%]
 <h3>Add a new [%classmetadata.moniker%]</h3>
-<FORM METHOD="post" ACTION="[%base%]/[%classmetadata.moniker%]/do_edit/">
+<FORM METHOD="post" ACTION="[%base%]/[%classmetadata.table%]/do_edit/">
     <INPUT TYPE="hidden" NAME="action" VALUE="create">
-    <INPUT TYPE="hidden" NAME="class" VALUE="[%classmetadata.name%]">
     <TABLE class="view">
      [% FOR col = classmetadata.columns;
         NEXT IF col == "id";

diff --git a/templates/factory/edit b/templates/factory/edit
index 0de9f7924fd0d9b0e4dd7090bda2b43ad5cc711d..90e87600dddd74513b651e1bcd8990a343f7b56a 100644 (file)
--- a/templates/factory/edit
+++ b/templates/factory/edit
@@ -13,7 +13,7 @@ form similar to L<add_new> but with the current values filled in.
 [% FOR item = objects; %]
 <h2> Edit [% item.name %]</h2>
 
-<FORM ACTION="[% base %]/[% classmetadata.moniker %]/do_edit/[% item.id %]" METHOD="post">
+<FORM ACTION="[% base %]/[% item.table %]/do_edit/[% item.id %]" METHOD="post">
 [%
      FOR col = classmetadata.columns;
         NEXT IF col == "id";

diff --git a/templates/factory/list b/templates/factory/list
index f1290efb1b9dd57607cf07f085984b28252dc114..99710287b2f626b838dbcf0c7af41a6fed36f56b 100644 (file)
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -17,13 +17,11 @@
 [% FOR col = classmetadata.columns.list;
     NEXT IF col == "id";
     "<TH>"; 
-        '<A HREF="'; base; classmetadata.moniker; "/list/?";
-        "page=" _ pager.current_page _ "&" IF pager;
-        "order="; col; 
-        "&o2=desc" IF col == request.query.order and request.query.o2 != "desc";
-        '">';
-        classmetadata.colnames.$col; 
-        '</A>';
+    SET additional = "?order=" _ col;
+    SET additional = additional _ "page=" _ pager.current_page _ "&" IF pager;
+    SET additional = additional _ "&o2=desc" 
+        IF col == request.query.order and request.query.o2 != "desc";
+     link(classmetadata.table, "list", additional, classmetadata.colnames.$col);
     "</TH>";
 END %]
 </TR>

diff --git a/templates/factory/navbar b/templates/factory/navbar
index b2dac727dd7af23a6d7f5ff5156b0c59769f4a17..40050d37c9d30907d9676535542cc2f3f83c9626 100644 (file)
--- a/templates/factory/navbar
+++ b/templates/factory/navbar
@@ -12,10 +12,10 @@ accessible, with a link to the list page for each one.
 <ul id="navlist">
 [%
     FOR table = config.display_tables;
-        '<LI '; 'id="active"' IF table == classmetadata.moniker; '>';
+        '<LI '; 'id="active"' IF table == classmetadata.table; '>';
 
         # Hack
-        SET active = '" id="current' IF table == classmetadata.moniker;
+        SET active = '" id="current' IF table == classmetadata.table;
 
         link(table, "list", active, table);
         SET active = "";