Changeset 718 for trunk/bin

Timestamp:

Feb 17, 2020 11:01:55 PM (4 years ago)

Author:

anonymous

Message:

Minor fixes

Location:

trunk/bin/module_maker

Files:

• form_template.cli.php (modified) (2 diffs)
• skel/admin.php (modified) (9 diffs)

trunk/bin/module_maker/form_template.cli.php

@@ -209 +209 @@
         case 'dec' :
         case 'numeric' :
-        default :
             $output[$field] = <<<E_O_F
 
@@ -225 +224 @@
         case 'time' :
         case 'year' :
-        default :
             $output[$field] = <<<E_O_F
 

trunk/bin/module_maker/skel/admin.php

@@ -56 +56 @@
 
 // Configure the cache object.
-$cache = new Cache('%NAME_PLURAL%');
+$cache =& Cache::getInstance('%NAME_PLURAL%');
 $cache->setParam(array('enabled' => true, 'expires' => 60));
 
@@ -64 +64 @@
 $page = new PageNumbers();
 $page->setPerPage(getFormData('per_page'), 100);
-$page->setPageNumber(getFormData('page_number'));
+$page->setPageNumber(getFormData('page_number', (getFormData('sort') ? 1 : null)));
 
 // Query parameters to retain always.
@@ -94 +94 @@
 switch (getFormData('op')) {
 
-case 'add' :
+case 'add':
     // Initialize variables for the form template.
-    $frm =& addRecordForm();
+    $frm = addRecordForm();
     $nav->add(_("Add %ITEM_TITLE%"));
     $main_template = '%ADMIN_FORM_TEMPLATE%';
     break;
 
-case 'edit' :
+case 'edit':
     // Initialize variables for the form template.
-    $frm =& editRecordForm(getFormData('%PRIMARY_KEY%'));
+    $frm = editRecordForm(getFormData('%PRIMARY_KEY%'));
     $nav->add(_("Edit %ITEM_TITLE%"));
     $main_template = '%ADMIN_FORM_TEMPLATE%';
     break;
 
-case 'del' :
+case 'del':
     deleteRecord(getFormData('%PRIMARY_KEY%'));%ADMIN_UPLOAD_DEL%
     if ($app->validBoomerangURL('%NAME_PLURAL%')) {
@@ -118 +118 @@
     break;
 
-case 'insert' :
+case 'insert':
     if (getFormdata('cancel', false)) {
         if ($app->validBoomerangURL('%NAME_PLURAL%')) {
@@ -129 +129 @@
     validateInput();
     if ($fv->anyErrors()) {
-        $frm =& addRecordForm();
+        $frm = addRecordForm();
         $frm = array_merge($frm, getFormData());
         $nav->add(_("Add %ITEM_TITLE%"));
@@ -147 +147 @@
     break;
 
-case 'update' :
+case 'update':
     if (getFormdata('reset', false)) {
         $app->raiseMsg(_("Saved values have been reloaded."), MSG_NOTICE, __FILE__, __LINE__);
@@ -165 +165 @@
     validateInput();
     if ($fv->anyErrors()) {
-        $frm =& editRecordForm(getFormData('%PRIMARY_KEY%'));
+        $frm = editRecordForm(getFormData('%PRIMARY_KEY%'));
         $frm = array_merge($frm, getFormData());
         $nav->add(_("Edit %ITEM_TITLE%"));
@@ -216 +216 @@
 %FORM_VALIDATION%
 
-function &addRecordForm()
+function addRecordForm()
 {
     // Set default values for the reset of the fields.
@@ -232 +232 @@
 }
 
-function &editRecordForm($id)
+function editRecordForm($id)
 {
     global $lock, $locally_carried_queries;