Bug 11235: Names for reports and dictionary are cut off when quotes are used
To reproduce for saved reports: - Go to Home > Reports > Guided reports wizard - Create a report with double quotes in it's name, e.g. 'My "double quoted" report' - Go to "Saved reports", locate in the list the new report (name is correct here, is correct in database as well) - From the selection button at the right choose "Edit" - Result: Content of edit field for the report name is truncated (displays only: 'My') To reproduce for Reports dictionary: - Go to Home > Reports > Guided reports wizard - Create a new definition, give it the name 'The "double quoted" definition' and enter a text with double quotes for "Description" - Save - Verify that in the list of definitions both name and descriptions are truncated (in database as well) To test: - Apply patch - Verify that issues described above can no longer be reproduced Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Marc Véron
Jonathan Druart
parent
a44f202fdb
commit
f4c965781d
|
|
@ -80,27 +80,27 @@
|
|||
</form>
|
||||
<br />
|
||||
<table>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Description</th>
|
||||
<th>Area</th>
|
||||
<th>Definition</th>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Description</th>
|
||||
<th>Area</th>
|
||||
<th>Definition</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
[% FOREACH definition IN definitions %]
|
||||
<tr>
|
||||
<td>[% definition.name %]</td>
|
||||
<td>[% definition.description %]</td>
|
||||
<td>[% definition.areaname %]</td>
|
||||
<td>[% definition.saved_sql %]</td>
|
||||
<td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
|
||||
<input type="hidden" name="id" value="[% definition.id %]" />
|
||||
<input type="hidden" name="phase" value="Delete Definition" />
|
||||
<button type="submit" name="submit" class="btn btn-default btn-xs" id="delete"><i class="fa fa-trash"></i> Delete</button>
|
||||
</form></td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</table>
|
||||
</tr>
|
||||
[% FOREACH definition IN definitions %]
|
||||
<tr>
|
||||
<td>[% definition.name | html %]</td>
|
||||
<td>[% definition.description | html %]</td>
|
||||
<td>[% definition.areaname %]</td>
|
||||
<td>[% definition.saved_sql %]</td>
|
||||
<td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
|
||||
<input type="hidden" name="id" value="[% definition.id %]" />
|
||||
<input type="hidden" name="phase" value="Delete Definition" />
|
||||
<button type="submit" name="submit" class="btn btn-default btn-xs" id="delete"><i class="fa fa-trash"></i> Delete</button>
|
||||
</form></td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</table>
|
||||
[% ELSE %]
|
||||
<div class="dialog message">There are no saved definitions. <a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">Add a definition to the dictionary.</a></div>
|
||||
[% END %]
|
||||
|
|
@ -133,8 +133,8 @@
|
|||
<ol>
|
||||
<li>
|
||||
<input type="hidden" name="phase" value="New Term step 3" />
|
||||
<input type="hidden" name="definition_name" value="[% definition_name %]" />
|
||||
<input type="hidden" name="definition_description" value="[% definition_description %]" />
|
||||
<input type="hidden" name="definition_name" value="[% definition_name | html %]" />
|
||||
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
|
||||
<label for="area">Select table:</label><select name="area" id="area">
|
||||
[%- FOREACH area IN areas -%]
|
||||
<option value="[%- area.id -%]">[%- PROCESS area_name area=area.id -%]</option>
|
||||
|
|
@ -153,8 +153,8 @@
|
|||
<fieldset class="rows">
|
||||
<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 %]" />
|
||||
<input type="hidden" name="definition_name" value="[% definition_name | html %]" />
|
||||
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
|
||||
|
||||
<select id="availableColumns" name="columns" size="25" style="width:200px;height:300px;margin:1em;">
|
||||
[% FOREACH column IN columns %]
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
|
||||
<optgroup label="[% column.table %]">
|
||||
[% ELSE %]
|
||||
<option value="[% column.name %]">
|
||||
<option value="[% column.name %]">
|
||||
[% IF ( column.description ) %][% column.description %]
|
||||
[% ELSE %]
|
||||
[% column.name %]
|
||||
|
|
@ -189,19 +189,19 @@
|
|||
<fieldset class="rows">
|
||||
<legend>Step 4 of 5: Specify a value</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 %]" />
|
||||
<input type="hidden" name="definition_name" value="[% definition_name | html %]" />
|
||||
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
|
||||
<input type="hidden" name="columnstring" value="[% columnstring %]" />
|
||||
|
||||
[% FOREACH column IN columns %]
|
||||
<input type="hidden" name="criteria_column" value="[% column.name %]" />
|
||||
<ol><li><span class="label">Column: </span> [% column.name %]</li>
|
||||
[% IF ( column.distinct ) %]
|
||||
<li><label for="[% column.name %]_value">Choose: </label> <select id="[% column.name %]_value" name="[% column.name %]_value">
|
||||
[% FOREACH value IN column.values %]
|
||||
<option value="[% value.availablevalues %]">[% value.availablevalues %]</option>
|
||||
[% END %]
|
||||
</select></li>
|
||||
<li><label for="[% column.name %]_value">Choose: </label> <select id="[% column.name %]_value" name="[% column.name %]_value">
|
||||
[% FOREACH value IN column.values %]
|
||||
<option value="[% value.availablevalues %]">[% value.availablevalues %]</option>
|
||||
[% END %]
|
||||
</select></li>
|
||||
[% END %]
|
||||
[% IF ( column.date ) %]
|
||||
<li class="radio">
|
||||
|
|
@ -235,9 +235,9 @@
|
|||
|
||||
[% IF ( step_5 ) %]
|
||||
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
|
||||
<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 %]" />
|
||||
<input type="hidden" name="area" value="[% area %]" />
|
||||
<input type="hidden" name="definition_name" value="[% definition_name | html %]" />
|
||||
<input type="hidden" name="definition_description" value="[% definition_description | html %]" />
|
||||
<input type="hidden" name="columnstring" value="[% columnstring %]" />
|
||||
|
||||
<h3>Add new definition</h3>
|
||||
|
|
@ -246,10 +246,10 @@
|
|||
<legend>Step 5 of 5: Confirm details</legend>
|
||||
<ol>
|
||||
<li>
|
||||
<span class="label">Name:</span>[%- definition_name -%]
|
||||
<span class="label">Name:</span>[%- definition_name | html -%]
|
||||
</li>
|
||||
<li>
|
||||
<span class="label">Description:</span>[%- definition_description -%]
|
||||
<span class="label">Description:</span>[%- definition_description | html -%]
|
||||
</li>
|
||||
<li>
|
||||
<span class="label">Area:</span>[%- PROCESS area_name area=area -%]
|
||||
|
|
|
|||
|
|
@ -931,7 +931,7 @@ $(document).ready(function() {
|
|||
<legend>Create report from SQL</legend>
|
||||
<ol>
|
||||
<li><label for="reportname" class="required">Report name:</label>
|
||||
[% IF ( reportname ) %]<input type="text" class="required" required="required" id="reportname" name="reportname" value="[% reportname %]" size="50"/>
|
||||
[% IF ( reportname ) %]<input type="text" class="required" required="required" id="reportname" name="reportname" value="[% reportname | html %]" size="50"/>
|
||||
[% ELSE %]<input type="text" class="required" required="required" id="reportname" name="reportname" size="50" />[% END %] <span class="required">Required</span>
|
||||
</li>
|
||||
[% PROCESS group_and_subgroup_selection %]
|
||||
|
|
@ -1023,7 +1023,7 @@ Sub report:<select name="subreport">
|
|||
<fieldset class="rows">
|
||||
<legend>Edit SQL report</legend>
|
||||
<ol>
|
||||
<li><label for="reportname" class="required">Report name: </label><input type="text" id="reportname" name="reportname" value="[% reportname %]" size="50" class="required" required="required" /> <span class="required">Required</span></li>
|
||||
<li><label for="reportname" class="required">Report name: </label><input type="text" id="reportname" name="reportname" value="[% reportname | html %]" size="50" class="required" required="required" /> <span class="required">Required</span></li>
|
||||
[% PROCESS group_and_subgroup_selection %]
|
||||
[% IF (public) %]
|
||||
<li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0">No (default)</option> <option value="1" selected="selected">Yes</option> </select></li>
|
||||
|
|
|
|||
Loading…
Reference in New Issue