Bugzilla – Attachment 133789 Details for
Bug 23352
Define serial's collection in the subscription
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23352: (follow-up) Fixes for QA review
Bug-23352-follow-up-Fixes-for-QA-review.patch (text/plain), 5.33 KB, created by
Katrin Fischer
on 2022-04-25 13:46:41 UTC
(
hide
)
Description:
Bug 23352: (follow-up) Fixes for QA review
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-04-25 13:46:41 UTC
Size:
5.33 KB
patch
obsolete
>From de1c95523ebabb7d65b584b84531c29a639df4eb Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Mon, 7 Mar 2022 04:37:12 +0000 >Subject: [PATCH] Bug 23352: (follow-up) Fixes for QA review > >Test plan: >1. Confirm that >installer/data/mysql/atomicupdate/bug_23352-add_ccode_column_to_subscriptions_table.pl >has the exec flag > >2. Create a subscription. Notice the 'Collection' dropdown defaults to >the 'None' option - same as Location > >3. Save the subscription without changing the 'None' collection > >4. Receive the serial and confirm the 'Collection' field is empty > >5. Create a second subscription. Change the 'Collection' dropdown to >'Fiction', then save the subscription > >6. Receive the serial and confirm the 'Collection' dropdown is set to >'Fiction' > >7. Confirm that the 'Collection code' terminology in the template is replaced with >'Collection' > >Sponsored-By: Brimbank Library, Australia > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > C4/Items.pm | 5 +---- > .../bug_23352-add_ccode_column_to_subscriptions_table.pl | 0 > .../prog/en/modules/serials/subscription-add.tt | 5 +++-- > .../prog/en/modules/serials/subscription-detail.tt | 2 +- > 4 files changed, 5 insertions(+), 7 deletions(-) > mode change 100644 => 100755 installer/data/mysql/atomicupdate/bug_23352-add_ccode_column_to_subscriptions_table.pl > >diff --git a/C4/Items.pm b/C4/Items.pm >index a32be9ef41..866ae55b84 100644 >--- a/C4/Items.pm >+++ b/C4/Items.pm >@@ -1698,10 +1698,7 @@ sub PrepareItemrecordDisplay { > && $defaultvalues > && $defaultvalues->{'ccode'} ) { > >- if ( $itemrecord and $defaultvalues and not $itemrecord->subfield($tag,$subfield->{subfield}) ) { >- # if the item record exists, only use default value if the item has no ccode >- $defaultvalue = $defaultvalues->{ccode}; >- } elsif ( !$itemrecord and $defaultvalues ) { >+ if ( !$itemrecord and $defaultvalues ) { > # if the item record *doesn't* exists, always use the default value > $defaultvalue = $defaultvalues->{ccode}; > } >diff --git a/installer/data/mysql/atomicupdate/bug_23352-add_ccode_column_to_subscriptions_table.pl b/installer/data/mysql/atomicupdate/bug_23352-add_ccode_column_to_subscriptions_table.pl >old mode 100644 >new mode 100755 >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index 688fb9a370..53760cf4fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -200,10 +200,11 @@ fieldset.rows table { clear: none; margin: 0; } > </select> > </li> > <li> >- <label for="ccode">Collection code:</label> >+ <label for="ccode">Collection:</label> > <select name="ccode" id="ccode"> >+ <option value="">None</option> > [% FOREACH ccode_loo IN ccodes_loop %] >- [% IF (ccode_loo.selected) %] >+ [% IF ccode_loo.authorised_value == ccode %] > <option value="[% ccode_loo.authorised_value | html %]" selected="selected">[% ccode_loo.lib | html %]</option> > [% ELSE %] > <option value="[% ccode_loo.authorised_value | html %]">[% ccode_loo.lib | html %]</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index eb9fcdac76..31adcdb764 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -143,7 +143,7 @@ > <ol> > [% IF ( location ) %]<li><span class="label">Location:</span> [% location | html %]</li>[% END %] > [% IF ( callnumber ) %]<li><span class="label">Call number:</span> [% callnumber | html %]</li>[% END %] >- [% IF ( ccode ) %]<li><span class="label">Collection code:</span> [% ccode | html %]</li>[% END %] >+ [% IF ( ccode ) %]<li><span class="label">Collection:</span> [% ccode | html %]</li>[% END %] > [% IF ( staffdisplaycount ) %]<li><span class="label">Number of issues to display to staff:</span>[% staffdisplaycount | html %]</li>[% END %] > [% IF ( opacdisplaycount ) %]<li><span class="label">Number of issues to display in OPAC:</span>[% opacdisplaycount | html %]</li>[% END %] > [% IF ( letter ) %] >-- >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 23352
:
91678
|
91679
|
91901
|
91985
|
91986
|
92149
|
92165
|
92166
|
95662
|
101913
|
101914
|
101916
|
129123
|
129124
|
129125
|
129225
|
129226
|
129227
|
129228
|
131426
|
131427
|
131435
|
131437
|
131438
|
131439
|
132920
|
133679
|
133680
|
133681
|
133682
|
133683
|
133786
|
133787
|
133788
| 133789 |
133790
|
163965