Bugzilla – Attachment 112985 Details for
Bug 24786
Allow setting a cash register for a login session and configuring library-default cash registers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24786: (QA follow-up) String fix
Bug-24786-QA-follow-up-String-fix.patch (text/plain), 2.76 KB, created by
Martin Renvoize (ashimema)
on 2020-11-04 11:54:59 UTC
(
hide
)
Description:
Bug 24786: (QA follow-up) String fix
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-11-04 11:54:59 UTC
Size:
2.76 KB
patch
obsolete
>From 2266bb6f7d3b0135e7452738964d6462a4836a72 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 4 Nov 2020 11:52:06 +0000 >Subject: [PATCH] Bug 24786: (QA follow-up) String fix > >This patch updates 'Branch default' to 'Library default' on the login >page to match the coding terminology guidelines. > >We also update the table heading on the cash registers management page >to match the terminology above for clarity. >--- > .../intranet-tmpl/prog/en/modules/admin/cash_registers.tt | 6 +++--- > koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >index 97c10e56dc..8b4784d448 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >@@ -46,9 +46,9 @@ > [% CASE 'error_on_update' %] > An error occurred when updating this cash register. > [% CASE 'success_on_default' %] >- Branch default updated successfully. >+ Library default updated successfully. > [% CASE 'error_on_update' %] >- An error on setting branch default. >+ An error on setting library default. > [% CASE 'success_on_archive' %] > Cash register archived successfully. > [% CASE 'success_on_restore' %] >@@ -129,7 +129,7 @@ > <th>Name</th> > <th>Description</th> > <th>Library</th> >- <th>Default</th> >+ <th>Library default</th> > <th>Initial float</th> > <th>Actions</th> > </thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index 3e3fea0874..12c700ef49 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -101,7 +101,7 @@ > <p> > <label for="register_id">Cash register:</label> > <select name="register_id" id="register_id" class="input" tabindex="4"> >- <option id="noregister" value="" selected="selected">Branch default</option> >+ <option id="noregister" value="" selected="selected">Library default</option> > [% FOREACH r IN Registers.all() %] > <option class="[% r.branch | html %] [% IF r.branch_default %]default[% END %]" value="[% r.id | html %]" disabled hidden>[% r.name | html %]</option> > [% END %] >-- >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 24786
:
107145
|
107146
|
107147
|
107148
|
107149
|
107739
|
107740
|
107741
|
107742
|
107743
|
107754
|
107755
|
107756
|
107757
|
107758
|
107759
|
107957
|
107958
|
107959
|
107960
|
107961
|
107962
|
108060
|
108061
|
108062
|
108063
|
108064
|
108065
|
108066
|
108510
|
108511
|
108512
|
108513
|
108514
|
108515
|
108516
|
110162
|
110163
|
110164
|
110165
|
110166
|
110167
|
110168
|
110187
|
110188
|
110189
|
110190
|
110191
|
110192
|
110193
|
111066
|
111067
|
111068
|
111069
|
111070
|
111071
|
111072
|
111074
|
111126
|
111127
|
111128
|
111129
|
111130
|
111131
|
111132
|
111133
|
111220
|
111221
|
111222
|
111223
|
111224
|
111225
|
111226
|
111227
|
111228
|
111229
|
111230
|
111231
|
111232
|
111233
|
111234
|
111235
|
111611
|
111612
|
111613
|
111614
|
111615
|
111616
|
111617
|
111618
|
111619
|
111620
|
111623
|
111725
|
111757
|
111758
|
111759
|
111760
|
111761
|
111762
|
111763
|
111764
|
111765
|
111766
|
111767
|
111768
|
111769
|
111770
|
111776
|
111777
|
111778
|
111779
|
111780
|
111781
|
111782
|
111783
|
111784
|
111785
|
111786
|
111787
|
111788
| 112985 |
112988
|
112989
|
113226
|
113227
|
113241
|
113251
|
113253
|
113256
|
113257
|
113260