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

(-)a/catalogue/moredetail.pl (-3 / +9 lines)
Lines 146-155 foreach my $item (@items){ Link Here
146
        $item->{'issue'}= 0;
146
        $item->{'issue'}= 0;
147
    }
147
    }
148
}
148
}
149
$template->param(count => $data->{'count'},
149
my $borrower_link
150
	subscriptionsnumber => $subscriptionsnumber,
150
    = ( C4::Context->preference("BorrowingHistoryLink") eq 'details' )
151
    ? 'members/moremember.pl'
152
    : 'circ/circulation.pl';
153
$template->param(
154
    count               => $data->{'count'},
155
    subscriptionsnumber => $subscriptionsnumber,
151
    subscriptiontitle   => $data->{title},
156
    subscriptiontitle   => $data->{title},
152
	C4::Search::enabled_staff_search_views,
157
    borrowerlink        => $borrower_link,
158
    C4::Search::enabled_staff_search_views,
153
);
159
);
154
$template->param(BIBITEM_DATA => \@results);
160
$template->param(BIBITEM_DATA => \@results);
155
$template->param(ITEM_DATA => \@items);
161
$template->param(ITEM_DATA => \@items);
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 171-176 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
171
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CircControl',"ItemHomeLibrary",'Specify the agency that controls the circulation and fines policy',"PickupLibrary|PatronLibrary|ItemHomeLibrary",'Choice');
171
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CircControl',"ItemHomeLibrary",'Specify the agency that controls the circulation and fines policy',"PickupLibrary|PatronLibrary|ItemHomeLibrary",'Choice');
172
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesCalendar',"noFinesWhenClosed",'Specify whether to use the Calendar in calculating duedates and fines',"ignoreCalendar|noFinesWhenClosed",'Choice');
172
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesCalendar',"noFinesWhenClosed",'Specify whether to use the Calendar in calculating duedates and fines',"ignoreCalendar|noFinesWhenClosed",'Choice');
173
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('previousIssuesDefaultSortOrder',"asc",'Specify the sort order of Previous Issues on the circulation page',"asc|desc",'Choice');
173
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('previousIssuesDefaultSortOrder',"asc",'Specify the sort order of Previous Issues on the circulation page',"asc|desc",'Choice');
174
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowingHistoryLink','circhist','When showing borrower history for an item on the catalogue page, link to borrower','detail|circhist','Choice');
174
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('todaysIssuesDefaultSortOrder',"desc",'Specify the sort order of Todays Issues on the circulation page',"asc|desc",'Choice');
175
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('todaysIssuesDefaultSortOrder',"desc",'Specify the sort order of Todays Issues on the circulation page',"asc|desc",'Choice');
175
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., opac.mylibrary.com, the http:// will be added automatically by Koha.',NULL,'Free');
176
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., opac.mylibrary.com, the http:// will be added automatically by Koha.',NULL,'Free');
176
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('language','en','Set the default language in the staff client.',NULL,'Languages');
177
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('language','en','Set the default language in the staff client.',NULL,'Languages');
(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
Lines 4446-4451 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4446
    SetVersion($DBversion);
4446
    SetVersion($DBversion);
4447
}
4447
}
4448
4448
4449
$DBversion = "xxx";
4450
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4451
    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowingHistoryLink','circhist','When showing borrower history for an item on the catalogue page, link to borrower','detail|circhist','Choice')");
4452
    print "Add the system preference 'BorrowingHistoryLink' (bug 6905)\n";
4453
    SetVersion($DBversion);
4454
}
4449
4455
4450
=head1 FUNCTIONS
4456
=head1 FUNCTIONS
4451
4457
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
Lines 24-29 Circulation: Link Here
24
                  desc: latest to earliest
24
                  desc: latest to earliest
25
            - due date.
25
            - due date.
26
        -
26
        -
27
            - When showing borrower history for an item on the catalogue page, link to borrower
28
            - pref: BorrowingHistoryLink
29
              choices:
30
                  details: details
31
                  circhist: circulation history
32
        -
27
            - "Sort today's checkouts on the circulation page from"
33
            - "Sort today's checkouts on the circulation page from"
28
            - pref: todaysIssuesDefaultSortOrder
34
            - pref: todaysIssuesDefaultSortOrder
29
              type: choice
35
              type: choice
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-4 / +3 lines)
Lines 169-177 Link Here
169
169
170
                <li><span class="label">Last seen:</span> [% ITEM_DAT.datelastseen %]&nbsp;</li>
170
                <li><span class="label">Last seen:</span> [% ITEM_DAT.datelastseen %]&nbsp;</li>
171
                <li><span class="label">Last borrowed:</span> [% ITEM_DAT.datelastborrowed %]&nbsp;</li>
171
                <li><span class="label">Last borrowed:</span> [% ITEM_DAT.datelastborrowed %]&nbsp;</li>
172
                [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower0 %]">[% ITEM_DAT.card0 %]</a>&nbsp;</li>[% END %]
172
                [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last Borrower:</span> <a href="/cgi-bin/koha/[% borrowerlink %]?borrowernumber=[% ITEM_DAT.borrower0 %]">[% ITEM_DAT.card0 %]</a>&nbsp;</li>[% END %]
173
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
173
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/[% borrowerlink %]?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
174
		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
174
		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/[% borrowerlink %]?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
175
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
175
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
176
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
176
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
177
            <li><span class="label">Public Note:</span>
177
            <li><span class="label">Public Note:</span>
178
- 

Return to bug 6905