Bugzilla – Attachment 139332 Details for
Bug 15348
Change/Edit estimated delivery date per order line
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions
Bug-15348-follow-up-Fix-breadcrumbs-title-JS-error.patch (text/plain), 5.16 KB, created by
Katrin Fischer
on 2022-08-18 07:53:34 UTC
(
hide
)
Description:
Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, permissions
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-08-18 07:53:34 UTC
Size:
5.16 KB
patch
obsolete
>From 5127893b418fc5142af9c5a33dcbb411388531ba Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleisha@catalyst.net.nz> >Date: Fri, 7 May 2021 15:02:42 +1200 >Subject: [PATCH] Bug 15348: (follow-up) Fix breadcrumbs, title, JS error, > permissions >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > acqui/addorder.pl | 2 +- > acqui/moddeliverydate.pl | 2 +- > .../prog/en/modules/acqui/lateorders.tt | 10 ++++---- > .../prog/en/modules/acqui/moddeliverydate.tt | 24 +++++++++++++++---- > 4 files changed, 28 insertions(+), 10 deletions(-) > >diff --git a/acqui/addorder.pl b/acqui/addorder.pl >index dbdd237f6e..7d5b7c30f3 100755 >--- a/acqui/addorder.pl >+++ b/acqui/addorder.pl >@@ -137,7 +137,7 @@ use Koha::Acquisition::Currencies qw( get_active ); > use Koha::Acquisition::Orders; > use Koha::Acquisition::Baskets; > use C4::Barcodes; >-use Koha::DateUtils; >+use Koha::DateUtils q( dt_from_string ); > > ### "-------------------- addorder.pl ----------" > >diff --git a/acqui/moddeliverydate.pl b/acqui/moddeliverydate.pl >index 48d5b5bbb8..239a0fc43e 100755 >--- a/acqui/moddeliverydate.pl >+++ b/acqui/moddeliverydate.pl >@@ -43,7 +43,7 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { > template_name => 'acqui/moddeliverydate.tt', > query => $input, > type => 'intranet', >- flagsrequired => { 'acquisition' => '*' }, >+ flagsrequired => { 'acquisition' => 'order_manage' }, > debug => 1, > } ); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 6e2c17c1a1..7f40b20f21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -110,9 +110,11 @@ > <td data-order="[% estimated_delivery_date | html %]"> > <p class="delivery_date"> > <span id="delivery_date_[% estimated_delivery_date | html %]">[% estimated_delivery_date | $KohaDates %]</span> >- <a class="edit_delivery_date noExport" data-ordernumber="[% lateorder.ordernumber | html %]" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% lateorder.ordernumber | html %]" title="Edit delivery date"> >- <i class="fa fa-pencil"></i> Edit >- </a> >+ [% IF CAN_user_acquisition_order_manage %] >+ <a class="edit_delivery_date noExport" data-ordernumber="[% lateorder.ordernumber | html %]" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% lateorder.ordernumber | html %]" title="Edit delivery date"> >+ <i class="fa fa-pencil"></i> Edit >+ </a> >+ [% END %] > </p> > </td> > <td> >@@ -199,7 +201,7 @@ > </tbody> > <tfoot> > <tr> >- <th colspan="7">Total</th> >+ <th colspan="6">Total</th> > <th>[% total_quantity | html %]</th> > <th>[% total | $Price %]</th> > <th colspan="10"> </th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt >index 5d50976119..c8075b119c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt >@@ -1,15 +1,31 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Acquisition › >- Change estimated delivery date >-</title> >+<title>Change estimated delivery date › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_moddeliverydate" class="acq"> > [% INCLUDE 'header.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketname | html %] ([% basketno | html %])</a> › Change estimated delivery date</div> >+<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >+ <ol> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketname | html %] ([% basketno | html %])</a> >+ </li> >+ <li> >+ <a href="#" aria-current="page">Change estimated delivery date</a> >+ </li> >+ </ol> >+</nav> > > <div class="main container-fluid"> > <div class="row"> >-- >2.30.2
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 15348
:
114430
|
114583
|
114623
|
115121
|
115122
|
115123
|
115124
|
116517
|
118788
|
118789
|
119297
|
119298
|
119299
|
120653
|
120654
|
120655
|
120656
|
136560
|
136561
|
136562
|
136563
|
137057
|
137058
|
137061
|
137098
|
137099
|
137740
|
137741
|
137742
|
137743
|
138110
|
138491
|
138529
|
138530
|
138531
|
138532
|
138533
|
138534
|
138535
|
138536
|
138537
|
138538
|
138539
|
138540
|
139245
|
139274
|
139301
|
139329
|
139330
|
139331
|
139332
|
139333
|
139334
|
139335
|
139336
|
139337
|
139338
|
139339
|
139340
|
139341
|
139342
|
139343
|
139351
|
139352
|
139353
|
139354
|
139355
|
139356
|
139357
|
139358
|
139359
|
139360
|
139361
|
139362
|
139363
|
139364
|
139365
|
139831
|
139832
|
139833
|
139834
|
139835
|
139836
|
139837
|
139838
|
139839
|
139840
|
139841
|
139842
|
139843
|
139844
|
139845
|
140708
|
140735
|
143896
|
143900
|
143903
|
143904