Bugzilla – Attachment 28136 Details for
Bug 12214
SQL errors in reports are not shown to user
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12214 [QA Followup] - Clean up reports-toolbar.inc, show Edit link when SQL has errors
PASSED-QA-Bug-12214-QA-Followup---Clean-up-reports.patch (text/plain), 3.25 KB, created by
Kyle M Hall (khall)
on 2014-05-09 13:38:52 UTC
(
hide
)
Description:
[PASSED QA] Bug 12214 [QA Followup] - Clean up reports-toolbar.inc, show Edit link when SQL has errors
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-05-09 13:38:52 UTC
Size:
3.25 KB
patch
obsolete
>From 43958f570f9d462b94a9bc5a8c3bbd4834717484 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 9 May 2014 09:35:03 -0400 >Subject: [PATCH] [PASSED QA] Bug 12214 [QA Followup] - Clean up reports-toolbar.inc, show Edit link when SQL has errors > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../prog/en/includes/reports-toolbar.inc | 32 ++++++++++++++----- > 1 files changed, 23 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index 782fc83..b7e7a79 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -1,17 +1,31 @@ > <div id="toolbar" class="btn-toolbar"> >- [% IF ( CAN_user_reports_create_reports ) %]<div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New report <span class="caret"></span></button> >+ [% IF ( CAN_user_reports_create_reports ) %] >+ <div class="btn-group"> >+ <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New report <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li> > <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li> > </ul> >- </div>[% END %] >-[% IF ( showsql || execute || editsql || save_successful ) %] >- [% UNLESS ( errors ) %][%# Unless there are errors saving a report %] >- [% UNLESS ( editsql ) %][%# Do not show edit button on edit page %] >- [% IF ( CAN_user_reports_create_reports ) %]<div class="btn-group"><a id="editreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Edit%20SQL"><i class="icon-pencil"></i> Edit</a></div>[% END %] >+ </div> >+ [% END %] >+ >+ [% IF ( showsql || execute || editsql || save_successful ) %] >+ [% UNLESS ( editsql ) # Do not show edit button on edit page %] >+ [% IF ( CAN_user_reports_create_reports ) %] >+ <div class="btn-group"> >+ <a id="editreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Edit%20SQL"> >+ <i class="icon-pencil"></i> Edit >+ </a> >+ </div> >+ [% END %] >+ [% END %] >+ >+ [% UNLESS ( errors ) # Unless there are errors saving a report %] >+ <div class="btn-group"> >+ <a id="runreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Run%20this%20report"> >+ <i class="icon-play"></i> Run report >+ </a> >+ </div> > [% END %] >- <div class="btn-group"><a id="runreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Run%20this%20report"><i class="icon-play"></i> Run report</a></div> > [% END %] >-[% END %] > </div> >-- >1.7.2.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 12214
:
28044
|
28115
|
28116
|
28117
|
28132
|
28133
|
28134
|
28135
| 28136