Bugzilla – Attachment 57012 Details for
Bug 8612
CSV export profile to have custom fields in export csv basket
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8612: QA followup - Make export button split button, unify button labels
Bug-8612-QA-followup---Make-export-button-split-bu.patch (text/plain), 3.96 KB, created by
Josef Moravec
on 2016-11-01 07:55:33 UTC
(
hide
)
Description:
Bug 8612: QA followup - Make export button split button, unify button labels
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2016-11-01 07:55:33 UTC
Size:
3.96 KB
patch
obsolete
>From 567e34baa40d0454ab07fc8afc7d4acf2cd8d4a7 Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Mon, 31 Oct 2016 12:57:11 +0000 >Subject: [PATCH] Bug 8612: QA followup - Make export button split button, > unify button labels > >--- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 36 +++++++++++----------- > 1 file changed, 18 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 91a028e..5ed745c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -1,16 +1,15 @@ >-[% BLOCK btn_group %] >+[% BLOCK csv_export %] > <div class="btn-group"> >- <fieldset class="action"> >- <label for="csv_code">Select CSV profile:</label> >- <select id="csv_profile_for_export"> >- <option value="default">default</option> >- [% IF csv_profiles %] >- [% FOR csv IN csv_profiles %] >- <option value="[% csv.export_format_id %]">[% csv.profile %]</option> >- [% END %] >- [% END %] >- </select> >- </fieldset> >+ <a id="exportbutton" class="btn btn-small" href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]"><i class="fa fa-download"></i> Export as CSV</a> >+ <a class="btn btn-small dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a> >+ <ul class="dropdown-menu" id="export-csv-menu"> >+ <li><a href="#">Default</a></li> >+ [% IF csv_profiles %] >+ [% FOR csv IN csv_profiles %] >+ <li><a href="#" data-value="[% csv.export_format_id %]">[% csv.profile %]</a></li> >+ [% END %] >+ [% END %] >+ </ul> > </div> > [% END %] > [% USE KohaDates %] >@@ -137,11 +136,13 @@ > confirm_reopen(); > }); > // Generates a dynamic link for exporting the selections data as CSV >- $("#exportbutton").click(function() { >+ $("#exportbutton, #export-csv-menu a").click(function() { > // Building the url from currently checked boxes > var url = '/cgi-bin/koha/acqui/basket.pl'; > url += $('#exportbutton').attr('href'); >- url += '&csv_profile=' + $("#csv_profile_for_export option:selected").val(); >+ if($(this).attr("data-value")) { >+ url += '&csv_profile=' + $(this).attr("data-value"); >+ } > // And redirecting to the CSV page > location.href = url; > return false; >@@ -223,8 +224,7 @@ > </div> > [% END %] > >- [% PROCESS btn_group %] >- <div class="btn-group"><a href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export </a></div> >+ [% PROCESS csv_export %] > > [% IF ediaccount %] > <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> >@@ -285,8 +285,8 @@ > <div id="toolbar" class="btn-toolbar"> > > <div class="btn-group"><a href="#" class="btn btn-small" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen this basket</a></div> >- [% PROCESS btn_group %] >- <div class="btn-group"><a href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div> >+ >+ [% PROCESS csv_export %] > > </div> > [% END %] >-- >2.1.4
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 8612
:
11514
|
36860
|
37289
|
37293
|
41224
|
41225
|
41226
|
41227
|
42532
|
42533
|
42534
|
47591
|
47592
|
47593
|
56222
|
56223
|
56224
|
56225
|
57012
|
57013
|
57024
|
57025
|
57026
|
57027
|
57028
|
57029
|
57079
|
58073
|
58074
|
58075
|
58076
|
58077
|
58078
|
58079
|
58985
|
58986
|
58987
|
58988
|
58989
|
58990
|
58991
|
58992
|
59757
|
60480
|
61264
|
61265
|
61266
|
61267
|
61405
|
61520
|
63048
|
63049
|
63050
|
63051
|
63052
|
63053
|
63054
|
63055
|
63056
|
63104
|
63158
|
63279
|
63910
|
63911
|
63912
|
63913
|
63914
|
63915
|
63964
|
63966