Changeset:
df33d386fd2b
https://sourceforge.net/p/mrbs/hg-code/ci/df33d386fd2b07b46d9779c47f02b8d728958e8b
Author:
Campbell Morrison <[email protected]>
Date:
Thu Mar 03 17:27:30 2016 +0000
Log message:
Added a datalist input to report inputs when the standard fields have
select_options or datalist_options defined. See SF Support Requests #909
diffstat:
web/report.php | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diffs (62 lines):
diff -r 88a8afcb8e5d -r df33d386fd2b web/report.php
--- a/web/report.php Thu Mar 03 17:07:46 2016 +0000
+++ b/web/report.php Thu Mar 03 17:27:30 2016 +0000
@@ -16,13 +16,16 @@
// <select>. That's because if we have options such as
// ('tea', 'white coffee', 'black coffee') we want the user to be able to
type
// 'coffee' which will match both 'white coffee' and 'black coffee'.
- if (!empty($select_options[$params['field']]))
+ if (isset($params['field']))
{
- $params['options'] = $select_options[$params['field']];
- }
- elseif (!empty($datalist_options[$params['field']]))
- {
- $params['options'] = $datalist_options[$params['field']];
+ if (!empty($select_options[$params['field']]))
+ {
+ $params['options'] = $select_options[$params['field']];
+ }
+ elseif (!empty($datalist_options[$params['field']]))
+ {
+ $params['options'] = $datalist_options[$params['field']];
+ }
}
if (isset($params['options']))
@@ -128,8 +131,9 @@
echo "<div id=\"div_namematch\">\n";
$params = array('label' => get_vocab("match_entry") . ':',
'name' => 'namematch',
- 'value' => $vars['namematch']);
- generate_input($params);
+ 'value' => $vars['namematch'],
+ 'field' => 'entry.name');
+ generate_report_input($params);
echo "</div>\n";
break;
@@ -138,8 +142,9 @@
echo "<div id=\"div_descrmatch\">\n";
$params = array('label' => get_vocab("match_descr") . ':',
'name' => 'descrmatch',
- 'value' => $vars['descrmatch']);
- generate_input($params);
+ 'value' => $vars['descrmatch'],
+ 'field' => 'entry.description');
+ generate_report_input($params);
echo "</div>\n";
break;
@@ -148,8 +153,9 @@
echo "<div id=\"div_creatormatch\">\n";
$params = array('label' => get_vocab("createdby") . ':',
'name' => 'creatormatch',
- 'value' => $vars['creatormatch']);
- generate_input($params);
+ 'value' => $vars['creatormatch'],
+ 'field' => 'entry.create_by');
+ generate_report_input($params);
echo "</div>\n";
break;
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
