From 620ba669abee460b9f58410c4ab75fa46e8abd23 Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> Date: Tue, 24 Mar 2015 16:12:32 +0100 Subject: [PATCH] [SIGNED OFF]Bug 4281: Reports dictionary supports only 1 field selection The reports dictionary allows the user to select several fields, but only 1 is used. The interface is quite confusing. This patch removes the multiple selection and permit to select only 1 field. Test plan: 1/ Create a report dictionary (reports/dictionary.pl) 2/ On the step 3, confirm that only 1 field can be selected Confirm there is no regression on this tool. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> --- .../prog/en/modules/reports/dictionary.tt | 43 ++-------------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index 7ca9c82..d26cabf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -21,7 +21,7 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a> [% IF ( new_dictionary ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Name the new definition</strong> [% ELSIF ( step_2 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 2: Choose the area </strong> -[% ELSIF ( step_3 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 3: Choose columns </strong> +[% ELSIF ( step_3 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 3: Choose a column </strong> [% ELSIF ( step_4 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 4: Specify a value </strong> [% ELSIF ( step_5 ) %] › <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> › <strong>Step 5: Confirm definition</strong> [% ELSE %] › <strong> Dictionary </strong>[% END %]</div> @@ -136,13 +136,12 @@ <h3>Add new definition</h3> <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> <fieldset class="rows"> -<legend>Step 3 of 5: Choose columns</legend> +<legend>Step 3 of 5: Choose a column</legend> <input type="hidden" name="area" value="[% area %]" /> <input type="hidden" name="definition_name" value="[% definition_name %]" /> <input type="hidden" name="definition_description" value="[% definition_description %]" /> -<table style="border: 0;margin:1em;"><tr> -<td style="border: 0;"><select id="availableColumns" name="oldcolumns2" size="25" style="width:200px;height:300px;"> +<select id="availableColumns" name="columns" size="25" style="width:200px;height:300px;margin:1em;"> [% FOREACH column IN columns %] [% IF ( column.table ) %] [% IF ( loop.first ) %] @@ -161,11 +160,7 @@ [% END %] [% END %] </optgroup> -</select></td> - -<td style="border: 0;"><input type="button" name="Add" value="Add" class="button" style="width : 6em; margin-bottom : .5em;" onclick="addColumn()" /><br /><input type="button" name="delete" value="<< Delete" class="button" style="width : 6em;" onclick="delColumn()" /> </td> - -<td style="border: 0;"><select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select> </td> </tr></table> +</select> <input type="hidden" name="phase" value="New Term step 4" /> </fieldset> @@ -282,34 +277,4 @@ [% INCLUDE 'guided-reports-view.inc' %] </div> </div> -<script type="text/javascript"> -//<![CDATA[ -function setObjects() { - selectedColumnsObj=document.getElementById('selectedColumns'); - availableColumnsObj=document.getElementById('availableColumns'); -} -setObjects(); - -function addColumn() { - for (i=0;i<availableColumnsObj.length;i++) { - if (availableColumnsObj.options[i].selected==true) { - var newColumnObj=document.createElement("OPTION"); - newColumnObj.value=availableColumnsObj.options[i].value; - newColumnObj.text=availableColumnsObj.options[i].text; - selectedColumnsObj.appendChild(newColumnObj); - newColumnObj.selected=true; - } - } -} - -function delColumn() { - for (i=0;i<=selectedColumnsObj.options.length;i++) { - if (selectedColumnsObj.options.selectedIndex>=0) { - selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex) - } - } -} -//]]> -</script> - [% INCLUDE 'intranet-bottom.inc' %] -- 1.9.1