Bugzilla – Attachment 158638 Details for
Bug 22188
Use publication date as numbering pattern
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22188: Bad rebase conflict fix
Bug-22188-Bad-rebase-conflict-fix.patch (text/plain), 9.94 KB, created by
Alex Buckley
on 2023-11-07 22:57:59 UTC
(
hide
)
Description:
Bug 22188: Bad rebase conflict fix
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2023-11-07 22:57:59 UTC
Size:
9.94 KB
patch
obsolete
>From 7d3c4e39c3aa5c827f00869277cf96cf6c817613 Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Tue, 7 Nov 2023 22:55:40 +0000 >Subject: [PATCH] Bug 22188: Bad rebase conflict fix > >--- > .../en/modules/serials/subscription-detail.tt | 213 +----------------- > 1 file changed, 2 insertions(+), 211 deletions(-) > >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 3ef18927c0a..c015ca116ac 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 >@@ -82,221 +82,12 @@ > </p> > </div> > [% END %] >- <div id="subscription_planning"> >- <div class="row"> >- <div class="col-sm-12"> >- <div class="rows"> >- <ol> >- <li><span class="label">Beginning date:</span> [% startdate | html %] >- </li> >- <li><span class="label">Frequency:</span> >- [% frequency.description | html %] >- </li> >- <li> >- <span class="label">Manual history: </span> >- [% IF ( manualhistory ) %] >- Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | uri %]">Edit history</a> >- [% ELSE %] >- Disabled >- [% END %] >- </li> >- <li><span class="label">Number pattern:</span> >+ > [% IF ( numberpattern ) %] > [% numberpattern.label | html %] > [% ELSE %] >- Uses publication date - [% dateformat %] format >- [% END %] >- </li> >- [% IF ( numberpattern ) %] >- <li><table> >- <tr> >- <td>Starting with:</td> >- [% IF (has_X) %] >- <td align="center">[% lastvalue1 | html %]</td> >- [% END %] >- [% IF (has_Y) %] >- <td align="center">[% lastvalue2 | html %]</td> >- [% END %] >- [% IF (has_Z) %] >- <td align="center">[% lastvalue3 | html %]</td> >- [% END %] >- </tr> >- <tr> >- <td>Rollover:</td> >- [% IF (has_X) %] >- <td align="center">[% numberpattern.whenmorethan1 | html %]</td> >- [% END %] >- [% IF (has_Y) %] >- <td align="center">[% numberpattern.whenmorethan2 | html %]</td> >+ Uses publication date > [% END %] >- [% IF (has_Z) %] >- <td align="center">[% numberpattern.whenmorethan3 | html %]</td> >- [% END %] >- </tr> >- </table></li> >- [% END %] >- [% IF ( irregular_issues ) %] >- <li><span class="label">Irregularity:</span> [% irregular_issues | html %] issues >- </li> >- [% END %] >- <li><span class="label">First arrival:</span> [% firstacquidate | html %] >- </li> >- [% IF ( numberlength ) %]<li><span class="label">Number of issues:</span> [% numberlength | html %]</li>[% END %] >- [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength | html %]</li>[% END %] >- [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength | html %]</li>[% END %] >- </ol> >- </div> >- </div> >- </div> >- </div> >- <div id="subscription_numbering" style="display:none;"> >- <h3>Numbering calculation</h3> >- <p><label>Numbering formula:</label> [% numberingmethod | html %]</p> >- <table> >- <tr> >- <th> </th> >- <th>X</th> >- <th>Y</th> >- <th>Z</th> >- </tr> >- <tr> >- <td>Add</td> >- <td> >- [% add1 | html %] >- </td> >- <td> >- [% add2 | html %] >- </td> >- <td> >- [% add3 | html %] >- </td> >- </tr> >- <tr> >- <td>once every</td> >- <td>[% every1 | html %]</td> >- <td>[% every2 | html %]</td> >- <td>[% every3 | html %]</td> >- </tr> >- <tr> >- <td>When more than</td> >- <td>[% whenmorethan1 | html %] [% IF ( innerloop1 ) %]<br /> >- <i>(is [% innerloop1 | html %])</i>[% END %]</td> >- <td>[% whenmorethan2 | html %] [% IF ( innerloop2 ) %]<br /> >- <i>(is [% innerloop2 | html %])</i>[% END %]</td> >- <td>[% whenmorethan3 | html %] [% IF ( innerloop3 ) %]<br /> >- <i>(is [% innerloop3 | html %])</i>[% END %]</td> >- </tr> >- <tr> >- <td>Set back to</td> >- <td>[% setto1 | html %]</td> >- <td>[% setto2 | html %]</td> >- <td>[% setto3 | html %]</td> >- </tr> >- <tr> >- <td> >- Inner counter >- </td> >- <td>[% innerloop1 | html %]</td> >- <td>[% innerloop2 | html %]</td> >- <td>[% innerloop3 | html %]</td> >- </tr> >- <tr> >- <td> >- Last value >- </td> >- <td>[% lastvalue1 | html %]</td> >- <td>[% lastvalue2 | html %]</td> >- <td>[% lastvalue3 | html %]</td> >- </tr> >- </table> >- </div> >- <div id="subscription_issues"> >- <table> >- <tr> >- <th>Issue number</th> >- <th>Planned date</th> >- <th>Published date</th> >- <th>Published date (text)</th> >- <th>Status</th> >- </tr> >- [% FOREACH serialslis IN serialslist %] >- <tr> >- <td> >- [% serialslis.serialseq | html %] >- </td> >- <td> >- [% IF serialslis.planneddate %] >- [% serialslis.planneddate | html %] >- [% ELSE %] >- Unknown >- [% END %] >- </td> >- <td> >- [% IF serialslis.publisheddate %] >- [% serialslis.publisheddate | html %] >- [% ELSE %] >- Unknown >- [% END %] >- </td> >- <td> >- [% 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 %] >- </td> >- </tr> >- [% END %] >- </table> >- </div> >- <div id="subscription_summary"> >- <div class="row"> >- <div class="col-sm-12"> >- <div class="rows"> >- <ol> >- <li><span class="label">Start date:</span> [% startdate | html %] </li> >- <li><span class="label">End date:</span> [% enddate | html %]</li> >- <li><span class="label">History start date:</span> [% histstartdate | html %] </li> >- <li><span class="label">History end date:</span> [% histenddate | html %]</li> >- <li><span class="label">Received issues:</span>[% recievedlist | html | html_line_break %]</li> >- <li><span class="label">Missing issues:</span>[% missinglist | html | html_line_break %]</li> >- <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li> >- <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li> >- <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li> >- <li><span class="label">History OPAC note:</span>[% opacnote | html | html_line_break %]</li> >- </ol> >- </div> >- </div> >- </div> >- </div> >- >- [% IF orders_grouped.size %] >- <div id="acquisition_details"> >- <h2>Acquisition details</h2> >- <table id="orders"> >- <caption> >- <span class="actions"> >- <a href="#" id="hide_received_orders">Hide already received orders</a> >- | <a href="#" id="show_all_orders">Show all orders</a> >- | <a href="#" id="expand_all">Expand all</a> >- | <a href="#" id="collapse_all">Collapse all</a> >- </span> >- </caption> > > [% WRAPPER tabs id= "subscription_description" %] > [% WRAPPER tabs_nav %] >-- >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 22188
:
84314
|
85415
|
85540
|
85541
|
85542
|
86419
|
87433
|
88830
|
91761
|
91762
|
92185
|
92186
|
92345
|
92364
|
94290
|
94291
|
156886
|
156887
|
156888
|
156889
|
156890
|
156891
|
157009
|
157010
|
157011
|
157012
|
157013
|
157014
|
157015
|
157179
| 158638 |
158659