Bugzilla – Attachment 138041 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) Rename patron-renewal => checkout-renewal
Bug-23838-QA-follow-up-Rename-patron-renewal--chec.patch (text/plain), 6.28 KB, created by
Martin Renvoize (ashimema)
on 2022-07-22 15:27:14 UTC
(
hide
)
Description:
Bug 23838: (QA follow-up) Rename patron-renewal => checkout-renewal
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-07-22 15:27:14 UTC
Size:
6.28 KB
patch
obsolete
>From f7b1acdab94f78a0ecf084360ecb456019ea4f17 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Fri, 22 Jul 2022 12:15:46 -0300 >Subject: [PATCH] Bug 23838: (QA follow-up) Rename patron-renewal => > checkout-renewal > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > ....inc => checkout-renewal-modal-strings.inc} | 0 > ...al-modal.inc => checkout-renewal-modal.inc} | 4 ++-- > .../prog/en/modules/members/readingrec.tt | 8 ++++---- > ...ewal-modal.js => checkout-renewal-modal.js} | 18 +++++++++--------- > 4 files changed, 15 insertions(+), 15 deletions(-) > rename koha-tmpl/intranet-tmpl/prog/en/includes/{patron-renewal-modal-strings.inc => checkout-renewal-modal-strings.inc} (100%) > rename koha-tmpl/intranet-tmpl/prog/en/includes/{patron-renewal-modal.inc => checkout-renewal-modal.inc} (78%) > rename koha-tmpl/intranet-tmpl/prog/js/{patron-renewal-modal.js => checkout-renewal-modal.js} (55%) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc >rename to koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc >similarity index 78% >rename from koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal.inc >rename to koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc >index d77875f6b4..baeb67d9d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc >@@ -1,9 +1,9 @@ >-<div id="patronRenewals" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="patronRenewalsLabel" aria-hidden="true"> >+<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="patronRenewalsLabel"> Item renewals</h3> >+ <h3 id="checkoutRenewalsLabel"> Item renewals</h3> > </div> > <div class="modal-body"> > <div id="retrieving" class="alert" style="display:none">Retrieving renewals...</div> >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 3d1961e4e6..5901b2a7bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -112,7 +112,7 @@ > <td> > [% issue.renewals_count | html %] > [% IF issue.renewals_count > 0 %] >- [ <a class="patron_renewals_view" data-renewals="[% issue.renewals_count | html %]" data-issueid="[% issue.issue_id | html %]" href="#">View</a> ] >+ [ <a class="checkout_renewals_view" data-renewals="[% issue.renewals_count | html %]" data-issueid="[% issue.issue_id | html %]" href="#">View</a> ] > [% END %] > </td> > <td data-order="[% issue.issuedate | html %]"> >@@ -159,11 +159,11 @@ > [% Asset.js("js/members-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- [% INCLUDE 'patron-renewal-modal.inc' %] >- [% INCLUDE 'patron-renewal-modal-strings.inc' %] >+ [% INCLUDE 'checkout-renewal-modal.inc' %] >+ [% INCLUDE 'checkout-renewal-modal-strings.inc' %] > [% INCLUDE 'js-date-format.inc' %] > [% INCLUDE 'js-patron-format.inc' %] >- [% Asset.js("js/patron-renewal-modal.js") | $raw %] >+ [% Asset.js("js/checkout-renewal-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/patron-renewal-modal.js b/koha-tmpl/intranet-tmpl/prog/js/checkout-renewal-modal.js >similarity index 55% >rename from koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js >rename to koha-tmpl/intranet-tmpl/prog/js/checkout-renewal-modal.js >index 20a9e16526..d6448ebabe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/checkout-renewal-modal.js >@@ -1,22 +1,22 @@ > $(document).ready(function(){ >- // Display the modal containing patron renewals details >- $('.patron_renewals_view').on('click', function(e) { >+ // Display the modal containing checkout renewals details >+ $('.checkout_renewals_view').on('click', function(e) { > e.preventDefault(); >- $('#patronRenewals #incomplete').html('').hide(); >- $('#patronRenewals #results').html('').hide(); >- $('#patronRenewals').modal({show:true}); >+ $('#checkoutRenewals #incomplete').html('').hide(); >+ $('#checkoutRenewals #results').html('').hide(); >+ $('#checkoutRenewals').modal({show:true}); > var renewals = $(this).data('renewals'); > var checkoutID = $(this).data('issueid'); >- $('#patronRenewals #retrieving').show(); >+ $('#checkoutRenewals #retrieving').show(); > $.get({ 'url': '/api/v1/checkouts/'+checkoutID+'/renewals', 'headers': { 'x-koha-embed': 'renewer' } }, function(data) { > if (data.length < renewals) { >- $('#patronRenewals #incomplete').append(renewed_prop.format(data.length, renewals)).show(); >+ $('#checkoutRenewals #incomplete').append(renewed_prop.format(data.length, renewals)).show(); > } > var items = data.map(function(item) { > return createLi(item); > }); >- $('#patronRenewals #retrieving').hide(); >- $('#patronRenewals #results').append(items).show(); >+ $('#checkoutRenewals #retrieving').hide(); >+ $('#checkoutRenewals #results').append(items).show(); > }); > }); > function createLi(renewal) { >-- >2.20.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