Bugzilla – Attachment 101743 Details for
Bug 12187
Duplicate TT code for serial statuses
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12187: (follow-up) Reindent new include file
Bug-12187-follow-up-Reindent-new-include-file.patch (text/plain), 9.46 KB, created by
Owen Leonard
on 2020-03-25 17:47:53 UTC
(
hide
)
Description:
Bug 12187: (follow-up) Reindent new include file
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2020-03-25 17:47:53 UTC
Size:
9.46 KB
patch
obsolete
>From db81117435ded6070f1f9ff40426d8008270547e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 25 Mar 2020 15:03:10 +0000 >Subject: [PATCH] Bug 12187: (follow-up) Reindent new include file > >This patch re-indents the new include file so that it is consistent with >coding guidelines. Taking this opportunity to add a full test plan: > >Instead of duplicating the code for serial statuses in multiple >files, move all of them into single include file, and use that. > >To test, apply the patch and go to Serials. > > - Search for a subscription which has multiple issues. > - On the subscription detail page, open the "Issues" tab. > - Statuses in the "Status" column should display correctly. > - Click the "Serial collection" link in the sidebar. > - In the table of issues, the "Status" colunn should display the > correct information. > - Select some isues and click the "Edit serials" button. > - In the "Status" column, the options should display correctly. > - Test setting various statuses and saving. The statuses should > save correctly. > - Click "Claims" in the sidebar menu and select a vendor. > - In the list of missing issues the "Status" column should show the > correct information. > - In the catalog, locate the bibliographic record for a subscription > with issues. > - Under the "Subscriptions" tab check the "Status" column. Status > information should be displayed correctly. >--- > .../prog/en/includes/serials-status.inc | 174 ++++++++++++--------- > 1 file changed, 100 insertions(+), 74 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc >index 88bdbb998c..90c9c78698 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc >@@ -1,77 +1,103 @@ > [% IF ( ShowOptions ) %] >- [% IF ( serial.status1 ) %] >- <option value="1" selected="selected">Expected</option> >- [% ELSIF ( not HideStatuses.match('\b1\b') ) %] >- <option value="1">Expected</option> >- [% END %] >- [% IF ( serial.status2 ) %] >- <option value="2" selected="selected">Arrived</option> >- [% ELSIF ( not HideStatuses.match('\b2\b') ) %] >- <option value="2">Arrived</option> >- [% END %] >- [% IF ( serial.status3 ) %] >- <option value="3" selected="selected">Late</option> >- [% ELSIF ( not HideStatuses.match('\b3\b') ) %] >- <option value="3">Late</option> >- [% END %] >- [% IF ( serial.status4 ) %] >- <option value="4" selected="selected">Missing</option> >- [% ELSIF ( not HideStatuses.match('\b4\b') ) %] >- <option value="4">Missing</option> >- [% END %] >- [% IF ( serial.status41 ) %] >- <option value="41" selected="selected">Missing (never received)</option> >- [% ELSIF ( not HideStatuses.match('\b41\b') ) %] >- <option value="41">Missing (never received)</option> >- [% END %] >- [% IF ( serial.status42 ) %] >- <option value="42" selected="selected">Missing (sold out)</option> >- [% ELSIF ( not HideStatuses.match('\b42\b') ) %] >- <option value="42">Missing (sold out)</option> >- [% END %] >- [% IF ( serial.status43 ) %] >- <option value="43" selected="selected">Missing (damaged)</option> >- [% ELSIF ( not HideStatuses.match('\b43\b') ) %] >- <option value="43">Missing (damaged)</option> >- [% END %] >- [% IF ( serial.status44 ) %] >- <option value="44" selected="selected">Missing (lost)</option> >- [% ELSIF ( not HideStatuses.match('\b44\b') ) %] >- <option value="44">Missing (lost)</option> >- [% END %] >- [% IF ( serial.status7 ) %] >- <option value="7" selected="selected">Claimed</option> >- [% ELSIF ( not HideStatuses.match('\b7\b') ) %] >- <option value="7">Claimed</option> >- [% END %] >- [% IF ( serial.status5 ) %] >- <option value="5" selected="selected">Not available</option> >- [% ELSIF ( not HideStatuses.match('\b5\b') ) %] >- <option value="5">Not available</option> >- [% END %] >- [% IF ( serial.status6 ) %] >- <option value="6" selected="selected">Delete</option> >- [% ELSIF ( not HideStatuses.match('\b6\b') ) %] >- <option value="6">Delete</option> >- [% END %] >- [% IF serial.status8 %] >- <option value="8" selected="selected">Stopped</option> >- [% ELSIF ( not HideStatuses.match('\b8\b') ) %] >- <option value="8">Stopped</option> >- [% END %] >+ [% IF ( serial.status1 ) %] >+ <option value="1" selected="selected">Expected</option> >+ [% ELSIF ( not HideStatuses.match('\b1\b') ) %] >+ <option value="1">Expected</option> >+ [% END %] >+ [% IF ( serial.status2 ) %] >+ <option value="2" selected="selected">Arrived</option> >+ [% ELSIF ( not HideStatuses.match('\b2\b') ) %] >+ <option value="2">Arrived</option> >+ [% END %] >+ [% IF ( serial.status3 ) %] >+ <option value="3" selected="selected">Late</option> >+ [% ELSIF ( not HideStatuses.match('\b3\b') ) %] >+ <option value="3">Late</option> >+ [% END %] >+ [% IF ( serial.status4 ) %] >+ <option value="4" selected="selected">Missing</option> >+ [% ELSIF ( not HideStatuses.match('\b4\b') ) %] >+ <option value="4">Missing</option> >+ [% END %] >+ [% IF ( serial.status41 ) %] >+ <option value="41" selected="selected">Missing (never received)</option> >+ [% ELSIF ( not HideStatuses.match('\b41\b') ) %] >+ <option value="41">Missing (never received)</option> >+ [% END %] >+ [% IF ( serial.status42 ) %] >+ <option value="42" selected="selected">Missing (sold out)</option> >+ [% ELSIF ( not HideStatuses.match('\b42\b') ) %] >+ <option value="42">Missing (sold out)</option> >+ [% END %] >+ [% IF ( serial.status43 ) %] >+ <option value="43" selected="selected">Missing (damaged)</option> >+ [% ELSIF ( not HideStatuses.match('\b43\b') ) %] >+ <option value="43">Missing (damaged)</option> >+ [% END %] >+ [% IF ( serial.status44 ) %] >+ <option value="44" selected="selected">Missing (lost)</option> >+ [% ELSIF ( not HideStatuses.match('\b44\b') ) %] >+ <option value="44">Missing (lost)</option> >+ [% END %] >+ [% IF ( serial.status7 ) %] >+ <option value="7" selected="selected">Claimed</option> >+ [% ELSIF ( not HideStatuses.match('\b7\b') ) %] >+ <option value="7">Claimed</option> >+ [% END %] >+ [% IF ( serial.status5 ) %] >+ <option value="5" selected="selected">Not available</option> >+ [% ELSIF ( not HideStatuses.match('\b5\b') ) %] >+ <option value="5">Not available</option> >+ [% END %] >+ [% IF ( serial.status6 ) %] >+ <option value="6" selected="selected">Delete</option> >+ [% ELSIF ( not HideStatuses.match('\b6\b') ) %] >+ <option value="6">Delete</option> >+ [% END %] >+ [% IF serial.status8 %] >+ <option value="8" selected="selected">Stopped</option> >+ [% ELSIF ( not HideStatuses.match('\b8\b') ) %] >+ <option value="8">Stopped</option> >+ [% END %] > [% ELSE %] >- [% IF ( serial.status1 ) %]<span class="status-expected">Expected</span>[% END %] >- [% IF ( serial.status2 ) %]<span class="status-arrived">Arrived</span>[% END %] >- [% IF ( serial.status3 ) %]<span class="status-late">Late</span>[% END %] >- [% IF ( serial.status4 ) %]<span class="status-missing">Missing</span>[% END %] >- [% IF ( serial.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %] >- [% IF ( serial.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %] >- [% IF ( serial.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %] >- [% IF ( serial.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %] >- [% IF ( serial.status5 ) %]<span class="status-not_issued">Not issued</span>[% END %] >- [% IF ( serial.status6 ) %]<span class="status-delete">Delete</span>[% END %] >- [% IF ( serial.status7 ) %]<span class="status-claimed">Claimed >- [% IF ( serial.claimdate ) %]<span class="claimdate">[% serial.claimdate | html %]</span>[% END %] >- </span>[% END %] >- [% IF ( serial.status8 ) %]<span class="status-stopped">Stopped</span>[% END %] >+ [% IF ( serial.status1 ) %] >+ <span class="status-expected">Expected</span> >+ [% END %] >+ [% IF ( serial.status2 ) %] >+ <span class="status-arrived">Arrived</span> >+ [% END %] >+ [% IF ( serial.status3 ) %] >+ <span class="status-late">Late</span> >+ [% END %] >+ [% IF ( serial.status4 ) %] >+ <span class="status-missing">Missing</span> >+ [% END %] >+ [% IF ( serial.status41 ) %] >+ <span class="status-missing_never_received">Missing (never received)</span> >+ [% END %] >+ [% IF ( serial.status42 ) %] >+ <span class="status-missing_sold_out">Missing (sold out)</span> >+ [% END %] >+ [% IF ( serial.status43 ) %] >+ <span class="status-missing_damaged">Missing (damaged)</span> >+ [% END %] >+ [% IF ( serial.status44 ) %] >+ <span class="status-missing_lost">Missing (lost)</span> >+ [% END %] >+ [% IF ( serial.status5 ) %] >+ <span class="status-not_issued">Not issued</span> >+ [% END %] >+ [% IF ( serial.status6 ) %] >+ <span class="status-delete">Delete</span> >+ [% END %] >+ [% IF ( serial.status7 ) %] >+ <span class="status-claimed">Claimed >+ [% IF ( serial.claimdate ) %] >+ <span class="claimdate">[% serial.claimdate | html %]</span> >+ [% END %] >+ </span> >+ [% END %] >+ [% IF ( serial.status8 ) %] >+ <span class="status-stopped">Stopped</span> >+ [% END %] > [% END %] >-- >2.11.0
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 12187
:
78175
|
98966
|
101743
|
102047
|
102048