Changeset 22 for trunk/bin/module_maker/skel

Timestamp:

Nov 23, 2005 9:29:33 PM (19 years ago)

Author:

scdev

Message:

More bugs and shifting things about.

Location:

trunk/bin/module_maker/skel

Files:

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

trunk/bin/module_maker/skel/adm_form.ihtml

@@ -9 +9 @@
     <tr>
         <td>&nbsp;</td>
-        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
+        <td><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
 %ADM_FORM_TABLE_ROWS%
     <tr>
         <td>&nbsp;</td>
-        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
+        <td><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
 </table>

trunk/bin/module_maker/skel/admin.php

@@ -92 +92 @@
 //     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_ADD);
     if (getFormdata('cancel', false)) {
+        if (App::validBoomerangURL('%NAME_PLURAL%')) {
+            // Display boomerang page.
+            App::dieBoomerangURL('%NAME_PLURAL%');
+        }
+        // Display default page.
         App::dieURL($_SERVER['PHP_SELF']);
     }
@@ -100 +105 @@
         $nav->addPage(_("Add %ITEM_TITLE%"));
         $main_template = '%ADMIN_FORM_TEMPLATE%';
-    } else {%ADMIN_UPLOAD_INSERT%
-        $%PRIMARY_KEY% = insertRecord(getFormData());%ADMIN_UPLOAD_INSERT2%
+    } else {
+        $%PRIMARY_KEY% = insertRecord(getFormData());%ADMIN_UPLOAD_INSERT%
         if (getFormdata('repeat', false)) {
             // Display function again.
@@ -122 +127 @@
     if (getFormdata('cancel', false)) {
         // Remove lock
-        $lock =& RecordLock::getInstance($GLOBALS['auth']);
         $lock->select('%DB_TBL%', '%PRIMARY_KEY%', getFormData('%PRIMARY_KEY%'));
         $lock->remove();
@@ -202 +206 @@
 function &editRecordForm($id)
 {
-    $lock =& RecordLock::getInstance($GLOBALS['auth']);
+    global $lock;
+
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -240 +245 @@
 function deleteRecord($id)
 {
-    $lock =& RecordLock::getInstance($GLOBALS['auth']);
+    global $lock;
+    
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -291 +297 @@
 function updateRecord($frm)
 {
-    global $auth;
-    
-    $lock =& RecordLock::getInstance($GLOBALS['auth']);
+    global $auth, $lock;
+    
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%']);
     if ($lock->isLocked() && !$lock->isMine()) {