Changeset 19 for trunk/bin/module_maker/skel

Timestamp:

Nov 14, 2005 6:22:44 AM (19 years ago)

Author:

scdev

Message:

Rebuilt the services/admins.php script and templates. Fixes since v2 conversion. Lots of bugs and more to come!

Location:

trunk/bin/module_maker/skel

Files:

• adm_form.ihtml (modified) (1 diff)
• adm_list.ihtml (modified) (1 diff)
• admin.php (modified) (4 diffs)

trunk/bin/module_maker/skel/adm_form.ihtml

@@ -9 +9 @@
     <tr>
         <td>&nbsp;</td>
-        <td valign="top">
-        <?php if (!empty($frm['submit_caption'])) { ?><input type="submit" name="submit" value="<?php echo oTxt($frm['submit_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['repeat_caption'])) { ?><input type="submit" name="repeat" value="<?php echo oTxt($frm['repeat_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['reset_caption'])) { ?><input type="submit" name="reset" value="<?php echo oTxt($frm['reset_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['cancel_caption'])) { ?><input type="submit" name="cancel" value="<?php echo oTxt($frm['cancel_caption']); ?>" /><?php } ?>
-        </td>
+        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
 %ADM_FORM_TABLE_ROWS%
     <tr>
         <td>&nbsp;</td>
-        <td valign="top">
-        <?php if (!empty($frm['submit_caption'])) { ?><input type="submit" name="submit" value="<?php echo oTxt($frm['submit_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['repeat_caption'])) { ?><input type="submit" name="repeat" value="<?php echo oTxt($frm['repeat_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['reset_caption'])) { ?><input type="submit" name="reset" value="<?php echo oTxt($frm['reset_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['cancel_caption'])) { ?><input type="submit" name="cancel" value="<?php echo oTxt($frm['cancel_caption']); ?>" /><?php } ?>
-        </td>
+        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
 </table>

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -27 +27 @@
     <tr>
         <td class="padleft nowrap"><a title="<?php printf(_("Edit %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0"></a> &nbsp;</td>
-        <td class="padleft nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF('/admin/record_versions.php?record_table=%DB_TBL%&record_key=%PRIMARY_KEY%&boomerang=true&record_val=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
+        <td class="padleft nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF('/admin/versions.php?record_table=%DB_TBL%&record_key=%PRIMARY_KEY%&boomerang=true&record_val=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
 %ADM_LIST_ROWS%
         <td class="padleft nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . "?op=del&%PRIMARY_KEY%=" . $list[$i]['%PRIMARY_KEY%']); ?>" onClick="javascript:return confirm('<?php printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt($list[$i]['______RECORD_NAME______'])) ?>')"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0"></a> &nbsp;</td>

trunk/bin/module_maker/skel/admin.php

@@ -217 +217 @@
 
     // Lock this record.
-    $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['address']);
+    $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['<##>']);
     
     // Set misc values for the form.
@@ -277 +277 @@
 
     // Create version.
-    $version = new RecordVersion();
+    $version = new RecordVersion($GLOBALS['auth']);
     $version->create('%DB_TBL%', '%PRIMARY_KEY%', $last_insert_id, $frm['<##>']);
     
@@ -300 +300 @@
         
         // Create version.
-        $version = new RecordVersion();
+        $version = new RecordVersion($GLOBALS['auth']);
         $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['<##>']);
     
@@ -349 +349 @@
             a2.username AS modified_admin_username
         FROM %DB_TBL%
-        LEFT JOIN admin_tbl a1 ON (%DB_TBL%.added_by_admin_id = a1.admin_id)
-        LEFT JOIN admin_tbl a2 ON (%DB_TBL%.modified_by_admin_id = a2.admin_id)
+        LEFT JOIN admin_tbl a1 ON (%DB_TBL%.added_by_user_id = a1.admin_id)
+        LEFT JOIN admin_tbl a2 ON (%DB_TBL%.modified_by_user_id = a2.admin_id)
         $where_clause
         " . $so->getSortOrderSQL() . "