Bugzilla – Attachment 102047 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: Duplicate TT code for serial statuses
Bug-12187-Duplicate-TT-code-for-serial-statuses.patch (text/plain), 19.19 KB, created by
David Nind
on 2020-03-29 07:37:42 UTC
(
hide
)
Description:
Bug 12187: Duplicate TT code for serial statuses
Filename:
MIME Type:
Creator:
David Nind
Created:
2020-03-29 07:37:42 UTC
Size:
19.19 KB
patch
obsolete
>From 0663e654da2818ac580020bb068e54f34bb6dc6d Mon Sep 17 00:00:00 2001 >From: Pasi Kallinen <pasi.kallinen@joensuu.fi> >Date: Fri, 24 Aug 2018 12:28:34 +0300 >Subject: [PATCH] Bug 12187: Duplicate TT code for serial statuses > >Instead of duplicating the code for serial statuses in multiple >files, move all of them into single include file, and use that. > >Needs a test plan, but I haven't used serials. > >Rebased > >Signed-off-by: David Nind <david@davidnind.com> >--- > .../prog/en/includes/serials-status.inc | 77 ++++++++++++++ > .../prog/en/modules/catalogue/detail.tt | 15 +-- > .../prog/en/modules/serials/claims.tt | 11 +- > .../prog/en/modules/serials/serials-collection.tt | 13 +-- > .../prog/en/modules/serials/serials-edit.tt | 116 +-------------------- > .../prog/en/modules/serials/subscription-detail.tt | 18 +--- > 6 files changed, 83 insertions(+), 167 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc >new file mode 100644 >index 0000000000..88bdbb998c >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc >@@ -0,0 +1,77 @@ >+[% 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 %] >+[% 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 %] >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 6ef518489b..80ab2a251b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -582,20 +582,7 @@ Note that permanent location is a code, and location may be an authval. > <td>[% latestserial.serialseq | html %]</td> > <td><span title="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</span></td> > <td><span title="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</span></td> >- <td> >- [% IF ( latestserial.status1 ) %]Expected[% END %] >- [% IF ( latestserial.status2 ) %]Arrived[% END %] >- [% IF ( latestserial.status3 ) %]Late[% END %] >- [% IF ( latestserial.status4 ) %]Missing[% END %] >- [% IF ( latestserial.status41 ) %]Missing (never received)[% END %] >- [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %] >- [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %] >- [% IF ( latestserial.status44 ) %]Missing (lost)[% END %] >- [% IF ( latestserial.status5 ) %]Not issued[% END %] >- [% IF ( latestserial.status6 ) %]Delete[% END %] >- [% IF ( latestserial.status7 ) %]Claimed[% END %] >- [% IF ( latestserial.status8 ) %]Stopped[% END %] >- </td> >+ <td>[% PROCESS 'serials-status.inc' serial=latestserial ShowOptions=0 %]</td> > <td>[% latestserial.notes | html %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index d25a515675..edc03326c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -132,16 +132,7 @@ > </td> > <td>[% missingissue.issn | html %]</td> > <td>[% missingissue.serialseq | html %]</td> >- <td> >- [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %] >- [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %] >- [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %] >- [% IF ( missingissue.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %] >- [% IF ( missingissue.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %] >- [% IF ( missingissue.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %] >- [% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %] >- [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %] >- </td> >+ <td>[% INCLUDE 'serials-status.inc' serial=missingissue ShowOptions=0 %]</td> > <td class="planneddate"> > [% IF ( missingissue.planneddate ) %] > <span title="[% missingissue.planneddateISO | html %]">[% missingissue.planneddate | html %]</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 192565e88f..0ac2354601 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -257,18 +257,7 @@ > [% END %] > </td> > <td> >- [% IF ( serial.status1 ) %]Expected[% END %] >- [% IF ( serial.status2 ) %]Arrived[% END %] >- [% IF ( serial.status3 ) %]Late[% END %] >- [% IF ( serial.status4 ) %]Missing[% END %] >- [% IF ( serial.status41 ) %]Missing (never received)[% END %] >- [% IF ( serial.status42 ) %]Missing (sold out)[% END %] >- [% IF ( serial.status43 ) %]Missing (damaged)[% END %] >- [% IF ( serial.status44 ) %]Missing (lost)[% END %] >- [% IF ( serial.status5 ) %]Not issued[% END %] >- [% IF ( serial.status6 ) %]Delete[% END %] >- [% IF ( serial.status7 ) %]Claimed[% END %] >- [% IF ( serial.status8 ) %]Stopped[% END %] >+ [% INCLUDE 'serials-status.inc' ShowOptions=0 %] > </td> > <td> > [% serial.notes | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index 8fe16b99fb..1893b34fe1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -148,64 +148,7 @@ $(document).ready(function() { > <select name="status" size="1" id="status[% serialslis.serialid | html %]" onchange="if (this.value==2 || this.value==7){changeDate(this, '[% serialslis.arriveddate | html %]')} else {changeDate(this, '[% serialslis.planneddate | html %]')}" > > [% END %] > [% END %] >- [% IF ( serialslis.status1 ) %] >- <option value="1" selected="selected">Expected</option> >- [% ELSE %] >- <option value="1">Expected</option> >- [% END %] >- [% IF ( serialslis.status2 ) %] >- <option value="2" selected="selected">Arrived</option> >- [% ELSE %] >- <option value="2">Arrived</option> >- [% END %] >- [% IF ( serialslis.status3 ) %] >- <option value="3" selected="selected">Late</option> >- [% ELSE %] >- <option value="3">Late</option> >- [% END %] >- [% IF ( serialslis.status4 ) %] >- <option value="4" selected="selected">Missing</option> >- [% ELSE %] >- <option value="4">Missing</option> >- [% END %] >- [% IF ( serialslis.status41 ) %] >- <option value="41" selected="selected">Missing (never received)</option> >- [% ELSE %] >- <option value="41">Missing (never received)</option> >- [% END %] >- [% IF ( serialslis.status42 ) %] >- <option value="42" selected="selected">Missing (sold out)</option> >- [% ELSE %] >- <option value="42">Missing (sold out)</option> >- [% END %] >- [% IF ( serialslis.status43 ) %] >- <option value="43" selected="selected">Missing (damaged)</option> >- [% ELSE %] >- <option value="43">Missing (damaged)</option> >- [% END %] >- [% IF ( serialslis.status44 ) %] >- <option value="44" selected="selected">Missing (lost)</option> >- [% ELSE %] >- <option value="44">Missing (lost)</option> >- [% END %] >- [% IF ( serialslis.status7 ) %] >- <option value="7" selected="selected">Claimed</option> >- [% ELSE %] >- <option value="7">Claimed</option> >- [% END %] >- [% IF ( serialslis.status5 ) %] >- <option value="5" selected="selected">Not available</option> >- [% ELSE %] >- <option value="5">Not available</option> >- [% END %] >- [% IF ( serialslis.status6 ) %] >- <option value="6" selected="selected">Delete</option> >- [% ELSE %] >- <option value="6">Delete</option> >- [% END %] >- [% IF serialslis.status8 %] >- <option value="8" selected="selected">Stopped</option> >- [% END %] >+ [% INCLUDE 'serials-status.inc' serial=serialslis ShowOptions=1 HideStatuses="8" %] > </select> > > </td> >@@ -304,62 +247,7 @@ $(document).ready(function() { > <select name="status" size="1" id="addstatus[% newserialloo.serialid | html %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid | html %][% newserialloo.serialid | html %]','label[% newserialloo.subscriptionid | html %][% newserialloo.serialid | html %]','[% newserialloo.serialid | html %]'); changeDate(this, '[% newserialloo.arriveddate | html %]')} else if (this.value==7){changeDate(this, '[% newserialloo.arriveddate | html %]')} else { HideItems('items'+'[% newserialloo.subscriptionid | html %]'+[% newserialloo.serialid | html %],'label[% serialslis.subscriptionid | html %][% serialslis.serialid | html %]'); changeDate(this, '[% serialslis.planneddate | html %]')}" > > > <option value="">----</option> >- [% IF ( newserialloo.status1 ) %] >- <option value="1" selected="selected">Expected</option> >- [% END %] >- [% IF ( newserialloo.status2 ) %] >- <option value="2" selected="selected">Arrived</option> >- [% ELSE %] >- <option value="2">Arrived</option> >- [% END %] >- [% IF ( newserialloo.status3 ) %] >- <option value="3" selected="selected">Late</option> >- [% ELSE %] >- <option value="3">Late</option> >- [% END %] >- [% IF ( newserialloo.status4 ) %] >- <option value="4" selected="selected">Missing</option> >- [% ELSE %] >- <option value="4">Missing</option> >- [% END %] >- [% IF ( newserialloo.status41 ) %] >- <option value="41" selected="selected">Missing (never received)</option> >- [% ELSE %] >- <option value="41">Missing (never received)</option> >- [% END %] >- [% IF ( newserialloo.status42 ) %] >- <option value="42" selected="selected">Missing (sold out)</option> >- [% ELSE %] >- <option value="42">Missing (sold out)</option> >- [% END %] >- [% IF ( newserialloo.status43 ) %] >- <option value="43" selected="selected">Missing (damaged)</option> >- [% ELSE %] >- <option value="43">Missing (damaged)</option> >- [% END %] >- [% IF ( newserialloo.status44 ) %] >- <option value="44" selected="selected">Missing (lost)</option> >- [% ELSE %] >- <option value="44">Missing (lost)</option> >- [% END %] >- [% IF ( newserialloo.status7 ) %] >- <option value="7" selected="selected">Claimed</option> >- [% ELSE %] >- <option value="7">Claimed</option> >- [% END %] >- [% IF ( newserialloo.status5 ) %] >- <option value="5" selected="selected">Not available</option> >- [% ELSE %] >- <option value="5">Not available</option> >- [% END %] >- [% IF ( newserialloo.status6 ) %] >- <option value="6" selected="selected">Delete</option> >- [% ELSE %] >- <option value="6">Delete</option> >- [% END %] >- [% IF newserialloo.status8 %] >- <option value="8" selected="selected">Stopped</option> >- [% END %] >+ [% INCLUDE 'serials-status.inc' serial=newserialloo ShowOptions=1 HideStatuses="1,8" %] > </select> > > </td> >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 03a7bc9592..9984b90958 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 >@@ -328,23 +328,7 @@ > [% serialslis.publisheddatetext | html %] > </td> > <td> >- [% IF ( serialslis.status1 ) %]Expected[% END %] >- [% IF ( serialslis.status2 ) %]Arrived[% END %] >- [% IF ( serialslis.status3 ) %]Late[% END %] >- [% IF ( serialslis.status4 ) %]Missing[% END %] >- [% IF ( serialslis.status41 ) %]Missing (never received)[% END %] >- [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %] >- [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %] >- [% IF ( serialslis.status44 ) %]Missing (lost)[% END %] >- [% IF ( serialslis.status5 ) %]Not issued[% END %] >- [% IF ( serialslis.status6 ) %]Delete[% END %] >- [% IF ( serialslis.status7 ) %] >- Claimed >- [% IF ( serialslis.claimdate ) %] >- [% serialslis.claimdate | html %] >- [% END %] >- [% END %] >- [% IF ( serialslis.status8 ) %]Stopped[% END %] >+ [% PROCESS 'serials-status.inc' serial=serialslis ShowOptions=0 %] > </td> > </tr> > [% END # /FOREACH serialslist %] >-- >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