Bugzilla – Attachment 68752 Details for
Bug 15486
Restrict number of holds placed by day
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15486: (followup) Tidy table code for readability
Bug-15486-followup-Tidy-table-code-for-readability.patch (text/plain), 13.49 KB, created by
Tomás Cohen Arazi (tcohen)
on 2017-10-27 15:16:52 UTC
(
hide
)
Description:
Bug 15486: (followup) Tidy table code for readability
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2017-10-27 15:16:52 UTC
Size:
13.49 KB
patch
obsolete
>From 70fa1d872236ead574284994cc5bdeac34491185 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Fri, 27 Oct 2017 11:40:48 -0300 >Subject: [PATCH] Bug 15486: (followup) Tidy table code for readability > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > .../prog/en/modules/admin/smart-rules.tt | 219 ++++++++++----------- > 1 file changed, 106 insertions(+), 113 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index e7d10f6..faab711 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -202,119 +202,112 @@ $(document).ready(function() { > </tr> > </thead> > <tbody> >- [% FOREACH rule IN rules %] >- <tr id="row_[% loop.count %]"> >- <td>[% IF ( rule.default_humancategorycode ) %] >- <em>All</em> >- [% ELSE %] >- [% rule.humancategorycode %] >- [% END %] >- </td> >- <td>[% IF rule.default_translated_description %] >- <em>All</em> >- [% ELSE %] >- [% rule.translated_description %] >- [% END %] >- </td> >- <td class="actions"> >- <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a> >- </td> >- >- <td>[% IF ( rule.unlimited_maxissueqty ) %] >- Unlimited >- [% ELSE %] >- [% rule.maxissueqty %] >- [% END %] >- </td> >- <td>[% IF rule.unlimited_maxonsiteissueqty %] >- Unlimited >- [% ELSE %] >- [% rule.maxonsiteissueqty %] >- [% END %] >- </td> >- <td>[% rule.issuelength %]</td> >- <td> >- [% rule.lengthunit %] >- </td> >- <td> >- [% IF ( rule.hardduedate ) %] >- [% IF ( rule.hardduedatebefore ) %] >- before [% rule.hardduedate %] >- <input type="hidden" name="hardduedatecomparebackup" value="-1" /> >- [% ELSIF ( rule.hardduedateexact ) %] >- on [% rule.hardduedate %] >- <input type="hidden" name="hardduedatecomparebackup" value="0" /> >- [% ELSIF ( rule.hardduedateafter ) %] >- after [% rule.hardduedate %] >- <input type="hidden" name="hardduedatecomparebackup" value="1" /> >- [% END %] >- [% ELSE %] >- None defined >- [% END %] >- </td> >- <td>[% rule.fine %]</td> >- <td>[% rule.chargeperiod %]</td> >- <td>[% IF rule.chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %]</td> >- <td>[% rule.firstremind %]</td> >- <td>[% rule.overduefinescap FILTER format("%.2f") %]</td> >- <td> >- [% IF rule.cap_fine_to_replacement_price %] >- <input type="checkbox" checked="checked" disabled="disabled" /> >- [% ELSE %] >- <input type="checkbox" disabled="disabled" /> >- [% END %] >- </td> >- <td>[% rule.finedays %]</td> >- <td>[% rule.maxsuspensiondays %]</td> >- <td>[% rule.renewalsallowed %]</td> >- <td>[% rule.renewalperiod %]</td> >- <td>[% rule.norenewalbefore %]</td> >- <td> >- [% IF ( rule.auto_renew ) %] >- Yes >- [% ELSE %] >- No >- [% END %] >- </td> >- <td>[% rule.no_auto_renewal_after %]</td> >- <td>[% rule.no_auto_renewal_after_hard_limit %]</td> >- <td>[% rule.reservesallowed %]</td> >- <td>[% IF rule.unlimited_holds_per_day %] >- Unlimited >- [% ELSE %] >- [% rule.holds_per_day %] >- [% END %] >- </td> >- <td>[% rule.holds_per_record %]</td> >- <td> >- [% IF rule.onshelfholds == 1 %] >- Yes >- [% ELSIF rule.onshelfholds == 2 %] >- If all unavailable >- [% ELSE %] >- If any unavailable >- [% END %]</td> >- <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td> >- <td> >- [% IF rule.article_requests == 'no' %] >- No >- [% ELSIF rule.article_requests == 'yes' %] >- Yes >- [% ELSIF rule.article_requests == 'bib_only' %] >- Record only >- [% ELSIF rule.article_requests == 'item_only' %] >- Item only >- [% END %] >- </td> >- <td>[% rule.rentaldiscount %]</td> >- <td class="actions"> >- <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a> >- </td> >- >- </tr> >- [% END %] >+ [% FOREACH rule IN rules %] >+ <tr id="row_[% loop.count %]"> >+ <td>[% IF ( rule.default_humancategorycode ) %] >+ <em>All</em> >+ [% ELSE %] >+ [% rule.humancategorycode %] >+ [% END %]</td> >+ <td>[% IF rule.default_translated_description %] >+ <em>All</em> >+ [% ELSE %] >+ [% rule.translated_description %] >+ [% END %]</td> >+ <td class="actions"> >+ <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"> >+ <i class="fa fa-trash"></i> Delete</a></td> >+ <td>[% IF ( rule.unlimited_maxissueqty ) %] >+ Unlimited >+ [% ELSE %] >+ [% rule.maxissueqty %] >+ [% END %]</td> >+ <td>[% IF rule.unlimited_maxonsiteissueqty %] >+ Unlimited >+ [% ELSE %] >+ [% rule.maxonsiteissueqty %] >+ [% END %]</td> >+ <td>[% rule.issuelength %]</td> >+ <td>[% rule.lengthunit %]</td> >+ <td>[% IF ( rule.hardduedate ) %] >+ [% IF ( rule.hardduedatebefore ) %] >+ before [% rule.hardduedate %] >+ <input type="hidden" name="hardduedatecomparebackup" value="-1" /> >+ [% ELSIF ( rule.hardduedateexact ) %] >+ on [% rule.hardduedate %] >+ <input type="hidden" name="hardduedatecomparebackup" value="0" /> >+ [% ELSIF ( rule.hardduedateafter ) %] >+ after [% rule.hardduedate %] >+ <input type="hidden" name="hardduedatecomparebackup" value="1" /> >+ [% END %] >+ [% ELSE %] >+ None defined >+ [% END %]</td> >+ <td>[% rule.fine %]</td> >+ <td>[% rule.chargeperiod %]</td> >+ <td>[% IF rule.chargeperiod_charge_at %] >+ Start of interval >+ [% ELSE %] >+ End of interval >+ [% END %]</td> >+ <td>[% rule.firstremind %]</td> >+ <td>[% rule.overduefinescap FILTER format("%.2f") %]</td> >+ <td>[% IF rule.cap_fine_to_replacement_price %] >+ <input type="checkbox" checked="checked" disabled="disabled" /> >+ [% ELSE %] >+ <input type="checkbox" disabled="disabled" /> >+ [% END %]</td> >+ <td>[% rule.finedays %]</td> >+ <td>[% rule.maxsuspensiondays %]</td> >+ <td>[% rule.renewalsallowed %]</td> >+ <td>[% rule.renewalperiod %]</td> >+ <td>[% rule.norenewalbefore %]</td> >+ <td>[% IF ( rule.auto_renew ) %] >+ Yes >+ [% ELSE %] >+ No >+ [% END %]</td> >+ <td>[% rule.no_auto_renewal_after %]</td> >+ <td>[% rule.no_auto_renewal_after_hard_limit %]</td> >+ <td>[% rule.reservesallowed %]</td> >+ <td>[% IF rule.unlimited_holds_per_day %] >+ Unlimited >+ [% ELSE %] >+ [% rule.holds_per_day %] >+ [% END %]</td> >+ <td>[% rule.holds_per_record %]</td> >+ <td>[% IF rule.onshelfholds == 1 %] >+ Yes >+ [% ELSIF rule.onshelfholds == 2 %] >+ If all unavailable >+ [% ELSE %] >+ If any unavailable >+ [% END %]</td> >+ <td>[% IF rule.opacitemholds == 'F'%] >+ Force >+ [% ELSIF rule.opacitemholds == 'Y'%] >+ Allow >+ [% ELSE %] >+ Don't allow >+ [% END %]</td> >+ <td>[% IF rule.article_requests == 'no' %] >+ No >+ [% ELSIF rule.article_requests == 'yes' %] >+ Yes >+ [% ELSIF rule.article_requests == 'bib_only' %] >+ Record only >+ [% ELSIF rule.article_requests == 'item_only' %] >+ Item only >+ [% END %]</td> >+ <td>[% rule.rentaldiscount %]</td> >+ <td class="actions"> >+ <a href="#" class="editrule btn btn-default btn-xs"> >+ <i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"> >+ <i class="fa fa-trash"></i> Delete</a></td> >+ </tr> >+ [% END %] > <tr id="edit_row"> > <td> > <select name="categorycode" id="categorycode"> >-- >2.7.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=68752">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15486
:
65128
|
65129
|
65130
|
65131
|
65132
|
65133
|
67202
|
67203
|
67204
|
67205
|
67206
|
67207
|
67337
|
67840
|
67841
|
67842
|
67843
|
67844
|
67845
|
68728
|
68729
|
68730
|
68731
|
68732
|
68733
|
68734
|
68735
|
68750
|
68751
|
68752
|
68791
|
71314
|
71315
|
71316
|
71317
|
71318
|
71319
|
72709
|
79318
|
79319
|
79320
|
79321
|
79322
|
79323
|
79324
|
79696
|
79697
|
79698
|
79699
|
79700
|
79701
|
79702
|
80478
|
80479
|
80480
|
80481
|
80482
|
80483
|
80484
|
81087