Bugzilla – Attachment 16288 Details for
Bug 9117
Reports hierarchies management improvements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 9117 [Follow-up] Reports hierarchies management improvements
PASSED-QA-Bug-9117-Follow-up-Reports-hierarchies-m.patch (text/plain), 6.76 KB, created by
Katrin Fischer
on 2013-03-18 16:42:51 UTC
(
hide
)
Description:
[PASSED QA] Bug 9117 [Follow-up] Reports hierarchies management improvements
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-03-18 16:42:51 UTC
Size:
6.76 KB
patch
obsolete
>From c921cb4b3919c9f3f22874811e1d52e0a8e4af4e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 21 Nov 2012 10:36:13 -0500 >Subject: [PATCH] [PASSED QA] Bug 9117 [Follow-up] Reports hierarchies > management improvements > >This patch corrects serveral markup errors in the template >introduced by this bug as well as previous patches: unescaped >ampersands, missing closing tags, typos. > >To test, view various stages of the process of viewing or >creating guided reports and check the source for validity. > >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > .../en/modules/reports/guided_reports_start.tt | 21 +++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index e2a5a19..99b4871 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -315,7 +315,7 @@ canned reports and writing custom SQL reports.</p> > <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Show%20SQL">Show</a> > [% IF ( CAN_user_reports_create_reports ) %] > <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Edit%20SQL">Edit</a> >- <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% savedreport.savedsql |uri %]&reportname=[% savedreport.report_name |uri %]¬es=[% savedreport.notes |uri %]">Duplicate</a> >+ <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% savedreport.savedsql |uri %]&reportname=[% savedreport.report_name |uri %]&notes=[% savedreport.notes |uri %]">Duplicate</a> > [% END %] > </td> > <td> >@@ -375,9 +375,9 @@ canned reports and writing custom SQL reports.</p> > [% END %] > </select></li> > [% 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</public> </select></li> >+ <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> > [% ELSE %] >- <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0" selected="selected">No (default)</option> <option value="1">Yes</public> </select></li> >+ <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0" selected="selected">No (default)</option> <option value="1">Yes</option> </select></li> > [% END %] > [% IF (usecache) %] <li> > <label for="cache_expiry">Cache expiry:</label><input type="text" id="cache_expiry" name="cache_expiry" value="[% cache_expiry %]"></input> >@@ -389,7 +389,7 @@ canned reports and writing custom SQL reports.</p> > </select> > </li>[% END %] > </ol> >-<ofieldset> >+</fieldset> > <fieldset class="action"> > <input type="hidden" name="phase" value="Report on this Area" /> > <input type="submit" name="submit" value="Next >>" /> >@@ -537,11 +537,13 @@ canned reports and writing custom SQL reports.</p> > </fieldset> > > [% IF ( definitions ) %] >-<fieldset><legend>Dictionary definitions</legend><table> >+<fieldset><legend>Dictionary definitions</legend> >+<table> > [% FOREACH definition IN definitions %] > <tr><td><input type="checkbox" name="definition" value="[% definition.id %]" /> [% definition.name %]</td></tr> > [% END %] > </table> >+</fieldset> > [% END %] > > <fieldset class="action"><input type="hidden" name="phase" value="Choose these criteria" /> >@@ -741,9 +743,9 @@ $(document).ready(function() { > [% 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</public> </select></li> >+ <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> > [% ELSE %] >- <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0" selected="selected">No (default)</option> <option value="1">Yes</public> </select></li> >+ <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0" selected="selected">No (default)</option> <option value="1">Yes</option> </select></li> > [% END %] > [% IF (usecache) %] <li> > <label for="cache_expiry">Cache expiry:</label><input type="text" id="cache_expiry" name="cache_expiry" value="[% cache_expiry %]"></input> >@@ -833,9 +835,9 @@ Sub report:<select name="subreport"> > <li><label for="reportname">Report name:</label><input type="text" id="reportname" name="reportname" value="[% reportname %]" size="50" /></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</public> </select></li> >+ <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> > [% ELSE %] >- <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0" selected="selelcted">No (default)</option> <option value="1">Yes</public> </select></li> >+ <li><label for="public">Report is public:</label><select id="public" name="public"> <option value="0" selected="selelcted">No (default)</option> <option value="1">Yes</option> </select></li> > [% END %] > [% IF (usecache) %] <li> > <label for="cache_expiry">Cache expiry:</label><input type="text" id="cache_expiry" name="cache_expiry" value="[% cache_expiry %]"></input> >@@ -912,6 +914,7 @@ Sub report:<select name="subreport"> > <li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filter_author %]" /></li> > <li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filter_keyword %]" /></li> > </ol> >+ </fieldset> > <fieldset class="action"><input type="submit" value="Apply filter" /></fieldset> > </form> > </div> >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9117
:
13560
|
13578
|
13597
|
13627
|
13628
|
13931
|
14668
|
14669
|
14670
|
16241
|
16244
|
16246
|
16270
|
16271
|
16282
|
16283
|
16284
|
16285
|
16286
|
16287
|
16288
|
16290
|
16292
|
16293
|
16294
|
16295
|
16296
|
16653