Changeset 655 for trunk/bin

Timestamp:

Jan 24, 2019 7:22:55 PM (5 years ago)

Author:

anonymous

Message:

Update module_maker. Minor fixes.

Location:

trunk/bin/module_maker

Files:

• skel/adm_list.ihtml (modified) (1 diff)
• skel/admin.php (modified) (9 diffs)
• validation.cli.php (modified) (1 diff)

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -8 +8 @@
         <input type="text" class="sc-small" size="20" name="search_query" value="<?php echo getFormData('search_query'); ?>" title="<?php echo oTxt(_("Fields searched: __///__ %SEARCH_FIELDS%.")); ?>" />
         <select name="filter___///__" class="sc-small">
-            <?php // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('' => 'Any __///__'), 'ORDER BY __///__ ASC'); ?>
+            <?php // HTML::printSelectOptions(HTML::getSelectOptions('__///___tbl', '__///___title', '__///___id', getFormData('filter___///__'), array('' => 'Any __///__'), 'ORDER BY __///__ ASC')); ?>
+        </select>
+        <select name="filter___///__" class="sc-small">
+            <?php // HTML::printSelectOptions(HTML::getSelectOptionsEnum('__///___tbl', '__///___', getFormData('filter___///__'), array('' => 'Any type'))); ?>
         </select>
         <input type="submit" value="<?php echo _("Filter"); ?>" />

trunk/bin/module_maker/skel/admin.php

@@ -30 +30 @@
 
 $auth->requireLogin();
-$app->sslOn();
 
 require_once 'codebase/lib/PageNumbers.inc.php';
@@ -89 +88 @@
 if (getFormData('break_list_cache', false)) {
     // Remove any stale cached list data.
-    $cache->delete('list');
+    $cache->delete('%NAME_SINGULAR% list');
 }
 
@@ -284 +283 @@
 
     // Remove any stale cached list data.
-    $cache->delete('list');
+    $cache->delete('%NAME_SINGULAR% list');
 
     // Get the information for this object.
@@ -315 +314 @@
 
     // Remove any stale cached list data.
-    $cache->delete('list');
+    $cache->delete('%NAME_SINGULAR% list');
 
 %INSERT%
@@ -343 +342 @@
 
     // Remove any stale cached list data.
-    $cache->delete('list');
+    $cache->delete('%NAME_SINGULAR% list');
 
 %UPDATE%
@@ -351 +350 @@
     $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['__///__']);
 
-    $app->raiseMsg(sprintf(_("The %ITEM_TITLE% <em>%s</em> has been updated."), $frm['__///__']), MSG_SUCCESS, __FILE__, __LINE__);
+    $app->raiseMsg(sprintf(_("The %ITEM_TITLE% <em>%s</em> has been updated. <a href=\"%s\" class=\"small secondary button\">Edit again</a>"), $frm['__///__'], $app->ohref('?op=edit&%PRIMARY_KEY%=' . $frm['%PRIMARY_KEY%'])), MSG_SUCCESS, __FILE__, __LINE__);
 
     // Unlock record.
@@ -415 +414 @@
     $cache_hash = md5($sql . '|' . $page->total_items);
     if ($tmp_prefs->get('cache_hash') != $cache_hash) {
-        $cache->delete('list');
+        $cache->delete('%NAME_SINGULAR% list');
         $tmp_prefs->set('cache_hash', $cache_hash);
     }
 
     // First try to return from the cache.
-    if ($cache->exists('list')) {
-        $list = $cache->get('list');
+    if ($cache->exists('%NAME_SINGULAR% list')) {
+        $list = $cache->get('%NAME_SINGULAR% list');
         return $list;
     }
@@ -433 +432 @@
     // Save this list into the cache.
     if (isset($list) && !empty($list)) {
-        $cache->set('list', $list);
+        $cache->set('%NAME_SINGULAR% list', $list);
     }
 
@@ -451 +450 @@
 
     // Remove any stale cached list data.
-    $cache->delete('list');
+    $cache->delete('%NAME_SINGULAR% list');
 
     // Count the ranks with invalid numbers

trunk/bin/module_maker/validation.cli.php

@@ -286 +286 @@
         case 'numeric' :
         case 'float' :
-            $max = str_repeat('9', $max_dig - $max_dec);
-            if ($max_dec > 0) {
-                $max .= '.' . str_repeat('9', $max_dec);
-            }
             if ($unsigned) {
                 $negative_ok = 'false';
-                $min = 0;
             } else {
                 $negative_ok = 'true';
-                $min = -$max;
             }
             $negative_ok = $unsigned ? 'false' : 'true';
-            $o[] = "\$fv->isDecimal('$field', sprintf(_(\"%s must be a number between %d and %d.\"), _(\"$title\"), $min, $max), $negative_ok, $max_dig, $max_dec);";
+            $o[] = "\$fv->isDecimal('$field', $max_dig, $max_dec, false, sprintf(_(\"%s must be a number with a maximum of %d integer digits and %d fractional digits, e.g., {EX}.\"), _(\"$title\"), ${max_dig}-${max_dec}, $max_dec), MSG_ERR, __FILE__, __LINE__);";
             break;