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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 895-900 No patron matched <span class="ex">[% message | html %]</span> Link Here
895
                    <th>Priority</th>
895
                    <th>Priority</th>
896
                    <th>Cancel?</th>
896
                    <th>Cancel?</th>
897
                    <th>Suspend?</th>
897
                    <th>Suspend?</th>
898
                    <th>Status</th>
898
                </tr>
899
                </tr>
899
            </thead>
900
            </thead>
900
        </table>
901
        </table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 764-769 Link Here
764
                                                    <th>Priority</th>
764
                                                    <th>Priority</th>
765
                                                    <th>Delete?</th>
765
                                                    <th>Delete?</th>
766
                                                    <th>Suspend?</th>
766
                                                    <th>Suspend?</th>
767
                                                    <th>Status</th>
767
                                                </tr>
768
                                                </tr>
768
                                            </thead>
769
                                            </thead>
769
                                        </table>
770
                                        </table>
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-33 / +41 lines)
Lines 53-89 $(document).ready(function() { Link Here
53
                    {
53
                    {
54
                        "mDataProp": function( oObj ) {
54
                        "mDataProp": function( oObj ) {
55
                            var data = "";
55
                            var data = "";
56
57
                            if ( oObj.suspend == 1 ) {
58
                                data += "<p>" + HOLD_IS_SUSPENDED;
59
                                if ( oObj.suspend_until ) {
60
                                    data += " " + UNTIL.format( oObj.suspend_until_formatted );
61
                                }
62
                                data += "</p>";
63
                            }
64
65
                            if ( oObj.itemtype_limit ) {
66
                                data += NEXT_AVAILABLE_ITYPE.format( oObj.itemtype_limit );
67
                            }
68
69
                            if ( oObj.barcode ) {
56
                            if ( oObj.barcode ) {
70
                                data += "<em>";
71
                                if ( oObj.found == "W" ) {
72
73
                                    if ( oObj.waiting_here ) {
74
                                        data += ITEM_IS_WAITING_HERE;
75
                                    } else {
76
                                        data += ITEM_IS_WAITING;
77
                                        data += " " + AT.format( oObj.waiting_at );
78
                                    }
79
80
                                } else if ( oObj.transferred ) {
81
                                    data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent );
82
                                } else if ( oObj.not_transferred ) {
83
                                    data += NOT_TRANSFERRED_YET.format( oObj.not_transferred_by );
84
                                }
85
                                data += "</em>";
86
87
                                data += " <a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
57
                                data += " <a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
88
                                  + oObj.biblionumber
58
                                  + oObj.biblionumber
89
                                  + "&itemnumber="
59
                                  + "&itemnumber="
Lines 94-100 $(document).ready(function() { Link Here
94
                                  + oObj.barcode.escapeHtml()
64
                                  + oObj.barcode.escapeHtml()
95
                                  + "</a>";
65
                                  + "</a>";
96
                            }
66
                            }
97
98
                            return data;
67
                            return data;
99
                        }
68
                        }
100
                    },
69
                    },
Lines 159-165 $(document).ready(function() { Link Here
159
                                     + "<i class='fa fa-pause'></i> " + SUSPEND + "</a>";
128
                                     + "<i class='fa fa-pause'></i> " + SUSPEND + "</a>";
160
                            }
129
                            }
161
                        }
130
                        }
162
                    }
131
                    },
132
                    {
133
                        "mDataProp": function( oObj ) {
134
                            var data = "";
135
                            if ( oObj.suspend != 1 && !oObj.itemtype_limit) {
136
                                data = _("Hold has been placed\n");
137
                            }
138
139
                            if ( oObj.suspend == 1 ) {
140
                                data += "<p>" + HOLD_IS_SUSPENDED;
141
                                if ( oObj.suspend_until ) {
142
                                    data += " " + UNTIL.format( oObj.suspend_until_formatted );
143
                                }
144
                                data += "</p>";
145
                            }
146
147
                            if ( oObj.itemtype_limit ) {
148
                                data += NEXT_AVAILABLE_ITYPE.format( oObj.itemtype_limit );
149
                            }
150
151
                            if ( oObj.barcode ) {
152
                                data += "<em>";
153
                                if ( oObj.found == "W" ) {
154
155
                                    if ( oObj.waiting_here ) {
156
                                        data += ITEM_IS_WAITING_HERE;
157
                                    } else {
158
                                        data += ITEM_IS_WAITING;
159
                                        data += " " + AT.format( oObj.waiting_at );
160
                                    }
161
162
                                } else if ( oObj.transferred ) {
163
                                    data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent );
164
                                } else if ( oObj.not_transferred ) {
165
                                    data += NOT_TRANSFERRED_YET.format( oObj.not_transferred_by );
166
                                }
167
                                data += "</em>";
168
                            }
169
                            return data;
170
                        }
171
                   }
163
                ],
172
                ],
164
                "bPaginate": false,
173
                "bPaginate": false,
165
                "bProcessing": true,
174
                "bProcessing": true,
166
- 

Return to bug 19630