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

(-)a/Koha/Manual.pm (-1 / +1 lines)
Lines 123-129 our $mapping = { Link Here
123
    'circ/renew'                               => '/circulation.html#renewing',
123
    'circ/renew'                               => '/circulation.html#renewing',
124
    'circ/reserveratios'                       => '/circulation.html#hold-ratios',
124
    'circ/reserveratios'                       => '/circulation.html#hold-ratios',
125
    'circ/returns'                             => '/circulation.html#check-in-returning',
125
    'circ/returns'                             => '/circulation.html#check-in-returning',
126
    'circ/selectbranchprinter'                 => '/circulation.html#set-library',
126
    'circ/set-library'                         => '/circulation.html#set-library',
127
    'circ/transferstoreceive'                  => '/circulation.html#transfers-to-receive',
127
    'circ/transferstoreceive'                  => '/circulation.html#transfers-to-receive',
128
    'circ/view_holdsqueue'                     => '/circulation.html#holds-queue',
128
    'circ/view_holdsqueue'                     => '/circulation.html#holds-queue',
129
    'circ/waitingreserves'                     => '/circulation.html#holds-awaiting-pickup',
129
    'circ/waitingreserves'                     => '/circulation.html#holds-awaiting-pickup',
(-)a/circ/branchtransfers.pl (-1 / +1 lines)
Lines 47-53 if (!C4::Context->userenv){ Link Here
47
	$session = get_session($sessionID) if $sessionID;
47
	$session = get_session($sessionID) if $sessionID;
48
    if (!$session){
48
    if (!$session){
49
		# no branch set we can't transfer
49
		# no branch set we can't transfer
50
		print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
50
        print $query->redirect("/cgi-bin/koha/circ/set-library.pl");
51
		exit;
51
		exit;
52
	}
52
	}
53
}
53
}
(-)a/circ/selectbranchprinter.pl (-2 / +2 lines)
Lines 30-36 use Koha::Libraries; Link Here
30
my $query = CGI->new();
30
my $query = CGI->new();
31
31
32
my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({
32
my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({
33
    template_name   => "circ/selectbranchprinter.tt",
33
    template_name   => "circ/set-library.tt",
34
    query           => $query,
34
    query           => $query,
35
    type            => "intranet",
35
    type            => "intranet",
36
    debug           => 1,
36
    debug           => 1,
Lines 77-83 foreach ($query->param()) { Link Here
77
}
77
}
78
78
79
my $referer =  $query->param('oldreferer') || $ENV{HTTP_REFERER};
79
my $referer =  $query->param('oldreferer') || $ENV{HTTP_REFERER};
80
$referer =~ /selectbranchprinter\.pl/ and undef $referer;   # avoid sending them back to this same page.
80
$referer =~ /set-library\.pl/ and undef $referer;   # avoid sending them back to this same page.
81
81
82
if (scalar @updated and not scalar @recycle_loop) {
82
if (scalar @updated and not scalar @recycle_loop) {
83
    # we updated something, and there were no extra params to POST: quick redirect
83
    # we updated something, and there were no extra params to POST: quick redirect
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-1 / +1 lines)
Lines 15-21 Link Here
15
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
15
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
16
            [% END %]
16
            [% END %]
17
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
17
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
18
                <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
18
                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>
19
            [% END %][% END %]
19
            [% END %][% END %]
20
            [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
20
            [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
21
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
21
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-2 / +2 lines)
Lines 110-121 Link Here
110
                    [% IF ( IndependentBranches ) %]
110
                    [% IF ( IndependentBranches ) %]
111
                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
111
                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
112
                    <li>
112
                    <li>
113
                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
113
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
114
                    </li>
114
                    </li>
115
                        [% END %]
115
                        [% END %]
116
                    [% ELSE %]
116
                    [% ELSE %]
117
                    <li>
117
                    <li>
118
                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
118
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
119
                    </li>
119
                    </li>
120
                    [% END %]
120
                    [% END %]
121
                    [% IF EnableSearchHistory %]
121
                    [% IF EnableSearchHistory %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc (-2 / +2 lines)
Lines 32-38 Link Here
32
        [% ELSIF ( error == 202 ) %]
32
        [% ELSIF ( error == 202 ) %]
33
            <span>An error has occurred. </span>[% INCLUDE asksysadmin %]
33
            <span>An error has occurred. </span>[% INCLUDE asksysadmin %]
34
        [% ELSIF ( error == 203 ) %]
34
        [% ELSIF ( error == 203 ) %]
35
            <span>A non-existent or invalid library code was supplied. Please verify that you have a library set. </span><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
35
            <span>A non-existent or invalid library code was supplied. Please verify that you have a library set. </span><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
36
        [% ELSIF ( error == 301 ) %]
36
        [% ELSIF ( error == 301 ) %]
37
            <span>An error has occurred while attempting to upload the image file. </span>[% INCLUDE asksysadmin %]
37
            <span>An error has occurred while attempting to upload the image file. </span>[% INCLUDE asksysadmin %]
38
        [% ELSIF ( error == 302 ) %]
38
        [% ELSIF ( error == 302 ) %]
Lines 44-50 Link Here
44
        [% ELSIF ( error == 401 ) %]
44
        [% ELSIF ( error == 401 ) %]
45
            <span>An error has occurred and no items have been added to batch [% batch_id | html %]. </span>[% INCLUDE asksysadmin %]
45
            <span>An error has occurred and no items have been added to batch [% batch_id | html %]. </span>[% INCLUDE asksysadmin %]
46
        [% ELSIF ( error == 402 ) %]
46
        [% ELSIF ( error == 402 ) %]
47
            <span>No items added because the library is not set. Please set your library before adding items to a batch. </span><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
47
            <span>No items added because the library is not set. Please set your library before adding items to a batch. </span><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
48
        [% ELSIF ( error == 403 ) %]
48
        [% ELSIF ( error == 403 ) %]
49
            <span>An error has occurred and the item(s) was not removed from batch [% batch_id | html %]. </span>[% INCLUDE asksysadmin %]
49
            <span>An error has occurred and the item(s) was not removed from batch [% batch_id | html %]. </span>[% INCLUDE asksysadmin %]
50
        [% ELSIF ( error == 404 ) %]
50
        [% ELSIF ( error == 404 ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-1 / +1 lines)
Lines 30-36 Link Here
30
                    </li>
30
                    </li>
31
                    [% UNLESS IndependentBranches %]
31
                    [% UNLESS IndependentBranches %]
32
                        <li>
32
                        <li>
33
                            <a class="circ-button" href="/cgi-bin/koha/circ/selectbranchprinter.pl"><i class="fa fa-home"></i> Set library</a>
33
                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>
34
                        </li>
34
                        </li>
35
                    [% END %]
35
                    [% END %]
36
                    [% IF ( fast_cataloging ) %]
36
                    [% IF ( fast_cataloging ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt (-4 / +3 lines)
Lines 7-20 Link Here
7
    .noshow {display: none;}
7
    .noshow {display: none;}
8
</style>
8
</style>
9
</head>
9
</head>
10
<body id="circ_selectbranchprinter" class="circ">
10
<body id="circ_set-library" class="circ">
11
[% INCLUDE 'header.inc' %]
11
[% INCLUDE 'header.inc' %]
12
[% INCLUDE 'circ-search.inc' %]
12
[% INCLUDE 'circ-search.inc' %]
13
13
14
<div id="breadcrumbs">
14
<div id="breadcrumbs">
15
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
15
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
16
&rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
16
&rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
17
&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
17
&rsaquo; <a href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
18
</div>
18
</div>
19
19
20
<div class="main container-fluid">
20
<div class="main container-fluid">
Lines 53-59 Updated:<ul> Link Here
53
53
54
[% ELSE %]
54
[% ELSE %]
55
55
56
<form method="post" action="selectbranchprinter.pl">
56
<form method="post" action="set-library.pl">
57
<fieldset class="rows">
57
<fieldset class="rows">
58
    <legend>Set library</legend>
58
    <legend>Set library</legend>
59
    <ol>
59
    <ol>
60
- 

Return to bug 24837