Bugzilla – Attachment 138043 Details for
Bug 23838
Add ability to view item renew history
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23838: (QA follow-up) Move include files
Bug-23838-QA-follow-up-Move-include-files.patch (text/plain), 5.92 KB, created by
Tomás Cohen Arazi (tcohen)
on 2022-07-22 15:54:42 UTC
(
hide
)
Description:
Bug 23838: (QA follow-up) Move include files
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2022-07-22 15:54:42 UTC
Size:
5.92 KB
patch
obsolete
>From 5ec4dced13a57ea4e1cd443a1898ee5e3e914f43 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Fri, 22 Jul 2022 12:46:30 -0300 >Subject: [PATCH] Bug 23838: (QA follow-up) Move include files > >As talked with Martin, this patches were originally developed before we >added the modals/ and str/ dirs, but we need to align it with current >way of doing it. This patch does that. > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > .../checkout_renewals.inc} | 13 +++++++------ > .../checkout_renewals.inc} | 1 + > .../prog/en/modules/catalogue/moredetail.tt | 6 +++--- > .../prog/en/modules/members/readingrec.tt | 6 +++--- > ...-renewal-modal.js => checkout_renewals_modal.js} | 0 > 5 files changed, 14 insertions(+), 12 deletions(-) > rename koha-tmpl/intranet-tmpl/prog/en/includes/{checkout-renewal-modal.inc => modals/checkout_renewals.inc} (75%) > rename koha-tmpl/intranet-tmpl/prog/en/includes/{checkout-renewal-modal-strings.inc => str/checkout_renewals.inc} (78%) > rename koha-tmpl/intranet-tmpl/prog/js/{checkout-renewal-modal.js => checkout_renewals_modal.js} (100%) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/checkout_renewals.inc >similarity index 75% >rename from koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc >rename to koha-tmpl/intranet-tmpl/prog/en/includes/modals/checkout_renewals.inc >index baeb67d9d8a..1748ac59b2e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/checkout_renewals.inc >@@ -1,18 +1,19 @@ >+<!-- Checkout renewals modal --> > <div id="checkoutRenewals" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="checkoutRenewalsLabel" aria-hidden="true"> > <div class="modal-dialog"> > <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="checkoutRenewalsLabel"> Item renewals</h3> >- </div> >+ </div> <!-- /.modal-header --> > <div class="modal-body"> > <div id="retrieving" class="alert" style="display:none">Retrieving renewals...</div> > <div id="incomplete" class="alert" style="display:none"></div> > <ul id="results" style="display:none"></ul> >- </div> >+ </div> <!-- /.modal-body --> > <div class="modal-footer"> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >- </div> >- </div> >- </div> >-</div> >+ </div> <!-- /.modal-footer --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+</div> <!-- /#checkoutRenewals --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc >similarity index 78% >rename from koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc >rename to koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc >index dde6014c0d6..a8dfcde80b6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc >@@ -1,3 +1,4 @@ >+<!-- str/checkout_renewals.inc --> > <script> > var renewed_prop = _("Note: %s out of %s renewals have been logged"); > var renewed = _("Renewed by"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index cdb239e7408..3bb6dc5b510 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -376,13 +376,13 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'catalog-strings.inc' %] >- [% INCLUDE 'checkout-renewal-modal.inc' %] >- [% INCLUDE 'checkout-renewal-modal-strings.inc' %] >+ [% INCLUDE 'modals/checkout_renewals.inc' %] >+ [% INCLUDE 'str/checkout_renewals.inc' %] > [% INCLUDE 'js-date-format.inc' %] > [% INCLUDE 'js-patron-format.inc' %] > [% Asset.js("js/catalog.js") | $raw %] > [% Asset.js("js/browser.js") | $raw %] >- [% Asset.js("js/checkout-renewal-modal.js") | $raw %] >+ [% Asset.js("js/checkout_renewals_modal.js") | $raw %] > <script> > var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); > browser.show(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index 5901b2a7bca..f3121647bd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -159,11 +159,11 @@ > [% Asset.js("js/members-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- [% INCLUDE 'checkout-renewal-modal.inc' %] >- [% INCLUDE 'checkout-renewal-modal-strings.inc' %] >+ [% INCLUDE 'modals/checkout_renewals.inc' %] >+ [% INCLUDE 'str/checkout_renewals.inc' %] > [% INCLUDE 'js-date-format.inc' %] > [% INCLUDE 'js-patron-format.inc' %] >- [% Asset.js("js/checkout-renewal-modal.js") | $raw %] >+ [% Asset.js("js/checkout_renewals_modal.js") | $raw %] > <script id="js"> > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings('members', 'checkouthistory', 'checkouthistory-table', 'json') | $raw %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkout-renewal-modal.js b/koha-tmpl/intranet-tmpl/prog/js/checkout_renewals_modal.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/js/checkout-renewal-modal.js >rename to koha-tmpl/intranet-tmpl/prog/js/checkout_renewals_modal.js >-- >2.34.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 23838
:
94394
|
94395
|
94635
|
94636
|
94663
|
94664
|
94676
|
94681
|
94682
|
94683
|
94684
|
94685
|
95466
|
95467
|
95468
|
95469
|
95470
|
95471
|
95472
|
96186
|
96187
|
96188
|
96189
|
96190
|
131892
|
131914
|
131915
|
133945
|
133946
|
133966
|
133967
|
133968
|
134890
|
134891
|
134892
|
137167
|
137168
|
137169
|
138007
|
138019
|
138020
|
138021
|
138022
|
138039
|
138040
|
138041
|
138042
| 138043