Bugzilla – Attachment 80700 Details for
Bug 11708
Display all basketgroups on one page, and new column aqbasketgroups.closeddate
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11708: Add missing TT filters and fix perlcritic errors
Bug-11708-Add-missing-TT-filters-and-fix-perlcriti.patch (text/plain), 10.46 KB, created by
Julian Maurice
on 2018-10-17 11:41:45 UTC
(
hide
)
Description:
Bug 11708: Add missing TT filters and fix perlcritic errors
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2018-10-17 11:41:45 UTC
Size:
10.46 KB
patch
obsolete
>From 691e91ee2a96449c0c821dffe9ecbfda9ce78ff5 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Wed, 17 Oct 2018 13:29:20 +0200 >Subject: [PATCH] Bug 11708: Add missing TT filters and fix perlcritic errors > >--- > acqui/basketgroup.pl | 1 - > .../prog/en/modules/acqui/basketgroups.tt | 49 ++++++++++--------- > 2 files changed, 25 insertions(+), 25 deletions(-) > >diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl >index 70c3e5cccf..fed5a394c8 100755 >--- a/acqui/basketgroup.pl >+++ b/acqui/basketgroup.pl >@@ -355,7 +355,6 @@ if ($op eq 'mod_basket') { > # template will know if basketgroup must be displayed or edited, depending on > # the value of closed key > >-my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid); > my $basketgroupid = $input->param('basketgroupid'); > my $billingplace; > my $deliveryplace; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt >index 67e7cb0b67..9c18fe1a80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt >@@ -1,6 +1,7 @@ > [% USE Asset %] > [% USE Branches %] > [% USE KohaDates %] >+[% USE raw %] > > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -10,7 +11,7 @@ > <title>Koha › Basket groups</title> > [% END %] > [% INCLUDE 'doc-head-close.inc' %] >-[% Asset.css('css/datatables.css') %] >+[% Asset.css('css/datatables.css') | $raw %] > </head> > <body id="acq_basketgroup" class="acq"> > [% INCLUDE 'header.inc' %] >@@ -22,7 +23,7 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > › > [% IF (bookseller) %] >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name |html %]</a> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a> > › > [% END %] > Basket groups >@@ -35,11 +36,11 @@ > [% IF bookseller %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% bookseller.id %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a> >+ <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% bookseller.id | $raw %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a> > </div> > </div> > >- <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name %]</a></h1> >+ <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a></h1> > [% END %] > > [% IF basketgroups.size > 0 %] >@@ -62,39 +63,39 @@ > <tr> > <td> > [% IF ( basketgroup.name ) %] >- [% basketgroup.name %] >+ [% basketgroup.name | html %] > [% ELSE %] >- Basket group no. [% basketgroup.id %] >+ Basket group no. [% basketgroup.id | $raw %] > [% END %] > </td> >- <td>[% basketgroup.vendor.name %]</td> >- <td>[% Branches.GetName(basketgroup.billingplace) %]</td> >+ <td>[% basketgroup.vendor.name | html %]</td> >+ <td>[% Branches.GetName(basketgroup.billingplace) | html %]</td> > <td> > [% IF (basketgroup.freedeliveryplace) %] >- [% basketgroup.freedeliveryplace %] >+ [% basketgroup.freedeliveryplace | html %] > [% ELSE %] >- [% Branches.GetName(basketgroup.deliveryplace) %] >+ [% Branches.GetName(basketgroup.deliveryplace) | html %] > [% END %] > </td> >- <td>[% basketgroup.baskets_count %]</td> >- <td>[% basketgroup.ordered_titles_count %]</td> >- <td>[% basketgroup.received_titles_count %]</td> >+ <td>[% basketgroup.baskets_count | $raw %]</td> >+ <td>[% basketgroup.ordered_titles_count | $raw %]</td> >+ <td>[% basketgroup.received_titles_count | $raw %]</td> > <td>[% basketgroup.closeddate | $KohaDates %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a> >- <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id %]"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id | $raw %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id | $raw %]"> > [% IF basketgroup.closeddate %] >- <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-eye"></i> View</a></li> >- <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-folder-open"></i> Reopen</a></li> >- <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Export as PDF</a></li> >- <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id %]"><i class="fa fa-file-text"></i> Export as CSV</a></li> >- <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&baskegroupid=[% basketgroup.id %]">Generate EDIFACT order</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-eye"></i> View</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-folder-open"></i> Reopen</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Export as PDF</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-file-text"></i> Export as CSV</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&baskegroupid=[% basketgroup.id | $raw %]">Generate EDIFACT order</a></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Close and export as PDF</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Close and export as PDF</a></li> > [% UNLESS basketgroup.baskets_count %] >- <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] > [% END %] > </ul> >@@ -117,7 +118,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% Asset.js('lib/jquery/plugins/jquery.dataTables.columnFilter.js') %] >+ [% Asset.js('lib/jquery/plugins/jquery.dataTables.columnFilter.js') | $raw %] > <script type="text/javascript"> > $(document).ready(function() { > var options = { >-- >2.17.1
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 11708
:
25115
|
25116
|
25117
|
26003
|
26004
|
26006
|
28868
|
28869
|
28870
|
28871
|
28872
|
31305
|
31306
|
31307
|
31308
|
31309
|
31530
|
31531
|
31532
|
31533
|
31534
|
31535
|
31536
|
31537
|
31538
|
31539
|
31540
|
31541
|
31542
|
31543
|
31544
|
31702
|
31703
|
31704
|
31705
|
31748
|
31749
|
31750
|
31751
|
31752
|
31753
|
32909
|
32910
|
32911
|
32912
|
32913
|
32914
|
33308
|
33309
|
33310
|
33311
|
33312
|
33313
|
34936
|
34937
|
34938
|
34939
|
34940
|
34941
|
34977
|
35748
|
35749
|
35750
|
35751
|
35752
|
35753
|
35754
|
35755
|
35756
|
35971
|
35972
|
35973
|
35974
|
35975
|
35976
|
35977
|
35978
|
35979
|
40260
|
40261
|
40262
|
40263
|
40264
|
40265
|
40266
|
40267
|
40268
|
40272
|
48992
|
48993
|
48994
|
48995
|
48996
|
52417
|
52418
|
52419
|
52420
|
52421
|
55277
|
55278
|
55279
|
58770
|
58771
|
58772
|
58773
|
58774
|
58775
|
58776
|
58777
|
58778
|
59301
|
59302
|
59303
|
59304
|
59305
|
59306
|
59307
|
59308
|
59309
|
61018
|
61019
|
61020
|
61021
|
61022
|
61023
|
61024
|
61025
|
61026
|
71260
|
71261
|
71262
|
71263
|
71264
|
71265
|
71266
|
71267
|
71268
|
72069
|
72070
|
72071
|
72072
|
72073
|
72074
|
72075
|
72076
|
72077
|
72691
|
72692
|
72693
|
72694
|
72695
|
72696
|
72697
|
72698
|
72699
|
74213
|
74214
|
74215
|
74216
|
74217
|
74218
|
74219
|
74220
|
74221
|
74222
|
74302
|
74303
|
74304
|
74305
|
74306
|
74307
|
74308
|
74309
|
74310
|
74311
|
74349
|
74350
|
74351
|
74352
|
74353
|
74354
|
74355
|
74356
|
74357
|
74358
|
75003
|
75004
|
75908
|
75909
|
78662
|
78663
|
78664
|
80697
|
80698
|
80699
|
80700
|
80979
|
80980
|
80981
|
80982
|
85786
|
85787
|
91285
|
91286
|
92378
|
92379
|
92380
|
92381
|
92382
|
93460
|
93461
|
93462
|
93463
|
93464
|
93482
|
93483
|
93484
|
93485
|
93487
|
104928
|
104929
|
104930
|
104931
|
104932
|
104933
|
104934
|
104935