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

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js (-14 / +12 lines)
Lines 4-9 $(document).ready(function() { Link Here
4
    $("#holds-tab").click( function() {
4
    $("#holds-tab").click( function() {
5
        if ( ! holdsTable ) {
5
        if ( ! holdsTable ) {
6
            holdsTable = $("#holds-table").dataTable({
6
            holdsTable = $("#holds-table").dataTable({
7
                "bAutoWidth": false,
7
                "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
8
                "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t",
8
                "aoColumns": [
9
                "aoColumns": [
9
                    {
10
                    {
Lines 11-17 $(document).ready(function() { Link Here
11
                    },
12
                    },
12
                    {
13
                    {
13
                        "mDataProp": function ( oObj ) {
14
                        "mDataProp": function ( oObj ) {
14
                            title = "<a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
15
                            title = "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber="
15
                                  + oObj.biblionumber
16
                                  + oObj.biblionumber
16
                                  + "'>"
17
                                  + "'>"
17
                                  + oObj.title;
18
                                  + oObj.title;
Lines 34-50 $(document).ready(function() { Link Here
34
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
35
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
35
                            }
36
                            }
36
37
37
                            title += " "
38
                                  + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
39
                                  + oObj.biblionumber
40
                                  + "&itemnumber="
41
                                  + oObj.itemnumber
42
                                  + "#"
43
                                  + oObj.itemnumber
44
                                  + "'>"
45
                                  + oObj.barcode
46
                                  + "</a>";
47
48
                            return title;
38
                            return title;
49
                        }
39
                        }
50
                    },
40
                    },
Lines 74-86 $(document).ready(function() { Link Here
74
                                        data += " " + AT + " " + oObj.waiting_at;
64
                                        data += " " + AT + " " + oObj.waiting_at;
75
                                    }
65
                                    }
76
                                } else if ( oObj.transferred ) {
66
                                } else if ( oObj.transferred ) {
77
                                    data += ITEM_IS + " <strong> " + IN_TRANSIT + " </strong> " + FROM + oObj.from_branch;
67
                                    data += ITEM_IS + " <strong> " + IN_TRANSIT + " </strong> " + FROM + " " + oObj.from_branch;
78
                                } else if ( oObj.not_transferred ) {
68
                                } else if ( oObj.not_transferred ) {
79
                                    data += NOT_TRANSFERRED_YET + " " + oObj.not_transferred_by;
69
                                    data += NOT_TRANSFERRED_YET + " " + oObj.not_transferred_by;
80
                                }                                 data += "</em>";
70
                                }                                 data += "</em>";
81
71
82
                                data += " <a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
72
                                data += " <a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
83
                                     + oObj.biblionumber + "'>" + oObj.barcode + "</a>";
73
                                  + oObj.biblionumber
74
                                  + "&itemnumber="
75
                                  + oObj.itemnumber
76
                                  + "#"
77
                                  + oObj.itemnumber
78
                                  + "'>"
79
                                  + oObj.barcode
80
                                  + "</a>";
84
                            }
81
                            }
85
82
86
                            return data;
83
                            return data;
Lines 97-102 $(document).ready(function() { Link Here
97
                        }
94
                        }
98
                    },
95
                    },
99
                    {
96
                    {
97
                        "bSortable": false,
100
                        "mDataProp": function( oObj ) {
98
                        "mDataProp": function( oObj ) {
101
                            return "<select name='rank-request'>"
99
                            return "<select name='rank-request'>"
102
                                 + "<option value='n'>" + NO + "</option>"
100
                                 + "<option value='n'>" + NO + "</option>"
(-)a/svc/holds.pl (-5 / +4 lines)
Lines 96-110 while ( my $h = $holds_rs->next() ) { Link Here
96
            GetFrameworkCode($biblionumber)
96
            GetFrameworkCode($biblionumber)
97
        ),
97
        ),
98
        reservedate_formatted => $h->reservedate() ? output_pref(
98
        reservedate_formatted => $h->reservedate() ? output_pref(
99
            { dt => dt_from_string( $h->reservedate() ), as_due_date => 1 }
99
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
100
          )
100
          )
101
        : q{},
101
        : q{},
102
        suspend_until_formatted => $h->suspend_until() ? output_pref(
102
        suspend_until_formatted => $h->suspend_until() ? output_pref(
103
            { dt => dt_from_string( $h->suspend_until() ), as_due_date => 1 }
103
            { dt => dt_from_string( $h->suspend_until() ), dateonly => 1 }
104
          )
104
          )
105
        : q{},
105
        : q{},
106
        expirationdate_formatted => $h->expirationdate() ? output_pref(
106
        expirationdate_formatted => $h->expirationdate() ? output_pref(
107
            { dt => dt_from_string( $h->expirationdate() ), as_due_date => 1 }
107
            { dt => dt_from_string( $h->expirationdate() ), dateonly => 1 }
108
          )
108
          )
109
        : q{},
109
        : q{},
110
    };
110
    };
Lines 123-129 while ( my $h = $holds_rs->next() ) { Link Here
123
        if ($transferred_when) {
123
        if ($transferred_when) {
124
            $hold->{color}       = 'transferred';
124
            $hold->{color}       = 'transferred';
125
            $hold->{transferred} = 1;
125
            $hold->{transferred} = 1;
126
            $hold->{date_sent}   = format_date($transferred_when);
126
            $hold->{date_sent} = output_pref( dt_from_string($transferred_when) );
127
            $hold->{from_branch} = GetBranchName($transferred_from);
127
            $hold->{from_branch} = GetBranchName($transferred_from);
128
        }
128
        }
129
        elsif ( $item->holdingbranch()->branchcode() ne
129
        elsif ( $item->holdingbranch()->branchcode() ne
130
- 

Return to bug 11703