View | Details | Raw Unified | Return to bug 32485
Collapse All | Expand All

(-)a/admin/columns_settings.yml (+2 lines)
Lines 330-335 modules: Link Here
330
              columnname: lost_processing_fee
330
              columnname: lost_processing_fee
331
            -
331
            -
332
              columnname: checkin_message
332
              columnname: checkin_message
333
            -
334
              columnname: checkout_message
333
            -
335
            -
334
              columnname: library_limitations
336
              columnname: library_limitations
335
            -
337
            -
(-)a/api/v1/swagger/definitions/item_type.yaml (+10 lines)
Lines 67-72 properties: Link Here
67
    type:
67
    type:
68
      - string
68
      - string
69
      - "null"
69
      - "null"
70
  checkout_message:
71
    description: Message that is displayed when an item with the given item type is checked out
72
    type:
73
      - string
74
      - "null"
75
  checkout_message_type:
76
    description: Type (CSS class) for the checkout_message, can be 'alert' or 'message'
77
    type:
78
      - string
79
      - "null"
70
  sip_media_type:
80
  sip_media_type:
71
    description: SIP2 protocol media type for this item type
81
    description: SIP2 protocol media type for this item type
72
    type:
82
    type:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt (+2 lines)
Lines 424-429 Link Here
424
            <th>Default replacement cost</th>
424
            <th>Default replacement cost</th>
425
            <th>Processing fee (when lost)</th>
425
            <th>Processing fee (when lost)</th>
426
            <th>Checkin message</th>
426
            <th>Checkin message</th>
427
            <th>Checkout message</th>
427
            <th>Library limitations</th>
428
            <th>Library limitations</th>
428
            <th>Automatic check-in</th>
429
            <th>Automatic check-in</th>
429
            <th class="noExport NoSort">Actions</th>
430
            <th class="noExport NoSort">Actions</th>
Lines 503-508 Link Here
503
            <td>[% itemtype.defaultreplacecost | $Price %]</td>
504
            <td>[% itemtype.defaultreplacecost | $Price %]</td>
504
            <td>[% itemtype.processfee | $Price %]</td>
505
            <td>[% itemtype.processfee | $Price %]</td>
505
            <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td>
506
            <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td>
507
            <td>[% itemtype.checkoutmsg | html_line_break | $raw %]</td>
506
            <td>
508
            <td>
507
                [% SET library_limits = itemtype.library_limits %]
509
                [% SET library_limits = itemtype.library_limits %]
508
                [% IF library_limits.count > 0 %]
510
                [% IF library_limits.count > 0 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-10 / +10 lines)
Lines 57-62 Link Here
57
                <div class="col-sm-10 col-sm-push-2">
57
                <div class="col-sm-10 col-sm-push-2">
58
                    [% INCLUDE 'messages.inc' %]
58
                    [% INCLUDE 'messages.inc' %]
59
59
60
                    [% IF ( checkoutmsg ) %]
61
                        [% IF ( checkoutmsgtype == 'alert' ) %]
62
                            <div class="dialog alert">
63
                        [% ELSE %]
64
                            <div class="dialog message">
65
                        [% END %]
66
                                <p class="ret_checkoutmsg">[% checkoutmsg | html_line_break %]</p>
67
                            </div>
68
                    [% END # /IF checkoutmsg %]
69
60
                    [% IF patron %]
70
                    [% IF patron %]
61
                        [% INCLUDE 'members-toolbar.inc' %]
71
                        [% INCLUDE 'members-toolbar.inc' %]
62
                    [% END %]
72
                    [% END %]
Lines 881-895 Link Here
881
                                            </div>
891
                                            </div>
882
                                        [% END %]
892
                                        [% END %]
883
893
884
                                        [% IF ( checkoutmsg ) %]
885
                                            [% IF ( checkoutmsgtype == 'alert' ) %]
886
                                                <div class="dialog alert" style="margin: 1em 0;">
887
                                            [% ELSE %]
888
                                                <div class="dialog message" style="margin: 1em 0;">
889
                                            [% END %]
890
                                                    <p class="ret_checkoutmsg">[% checkoutmsg | html_line_break %]</p>
891
                                                </div>
892
                                        [% END # /IF checkoutmsg %]
893
                                    </form> <!-- /#mainform -->
894
                                    </form> <!-- /#mainform -->
894
                                </div> <!-- /.col-sm-6 -->
895
                                </div> <!-- /.col-sm-6 -->
895
896
896
- 

Return to bug 32485