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

(-)a/C4/Auth.pm (-7 / +14 lines)
Lines 38-43 use Koha::Checkouts; Link Here
38
use Koha::DateUtils qw(dt_from_string);
38
use Koha::DateUtils qw(dt_from_string);
39
use Koha::Library::Groups;
39
use Koha::Library::Groups;
40
use Koha::Libraries;
40
use Koha::Libraries;
41
use Koha::Desks;
41
use Koha::Patrons;
42
use Koha::Patrons;
42
use Koha::Patron::Consents;
43
use Koha::Patron::Consents;
43
use POSIX qw/strftime/;
44
use POSIX qw/strftime/;
Lines 462-467 sub get_template_and_user { Link Here
462
        GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
463
        GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
463
        OpenLibraryCovers                                                  => C4::Context->preference("OpenLibraryCovers"),
464
        OpenLibraryCovers                                                  => C4::Context->preference("OpenLibraryCovers"),
464
        KohaAdminEmailAddress                                              => "" . C4::Context->preference("KohaAdminEmailAddress"),
465
        KohaAdminEmailAddress                                              => "" . C4::Context->preference("KohaAdminEmailAddress"),
466
        LoginDeskname                                                      => ( C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : undef ),
465
        LoginFirstname  => ( C4::Context->userenv ? C4::Context->userenv->{"firstname"} : "Bel" ),
467
        LoginFirstname  => ( C4::Context->userenv ? C4::Context->userenv->{"firstname"} : "Bel" ),
466
        LoginSurname    => C4::Context->userenv ? C4::Context->userenv->{"surname"}      : "Inconnu",
468
        LoginSurname    => C4::Context->userenv ? C4::Context->userenv->{"surname"}      : "Inconnu",
467
        emailaddress    => C4::Context->userenv ? C4::Context->userenv->{"emailaddress"} : undef,
469
        emailaddress    => C4::Context->userenv ? C4::Context->userenv->{"emailaddress"} : undef,
Lines 489-494 sub get_template_and_user { Link Here
489
            IntranetNav                                                                => C4::Context->preference("IntranetNav"),
491
            IntranetNav                                                                => C4::Context->preference("IntranetNav"),
490
            IntranetmainUserblock                                                      => C4::Context->preference("IntranetmainUserblock"),
492
            IntranetmainUserblock                                                      => C4::Context->preference("IntranetmainUserblock"),
491
            LibraryName                                                                => C4::Context->preference("LibraryName"),
493
            LibraryName                                                                => C4::Context->preference("LibraryName"),
494
            LoginDeskname                                                              => ( C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : undef ),
492
            advancedMARCEditor                                                         => C4::Context->preference("advancedMARCEditor"),
495
            advancedMARCEditor                                                         => C4::Context->preference("advancedMARCEditor"),
493
            canreservefromotherbranches                                                => C4::Context->preference('canreservefromotherbranches'),
496
            canreservefromotherbranches                                                => C4::Context->preference('canreservefromotherbranches'),
494
            intranetcolorstylesheet                                                    => C4::Context->preference("intranetcolorstylesheet"),
497
            intranetcolorstylesheet                                                    => C4::Context->preference("intranetcolorstylesheet"),
Lines 556-561 sub get_template_and_user { Link Here
556
            opac_name                             => $opac_name,
559
            opac_name                             => $opac_name,
557
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
560
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
558
            LibraryNameTitle                      => "" . $LibraryNameTitle,
561
            LibraryNameTitle                      => "" . $LibraryNameTitle,
562
            LoginDeskname                         => C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : "",
559
            OPACAmazonCoverImages                 => C4::Context->preference("OPACAmazonCoverImages"),
563
            OPACAmazonCoverImages                 => C4::Context->preference("OPACAmazonCoverImages"),
560
            OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"),
564
            OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"),
561
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
565
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
Lines 844-851 sub checkauth { Link Here
844
                $session->param('cardnumber'),   $session->param('firstname'),
848
                $session->param('cardnumber'),   $session->param('firstname'),
845
                $session->param('surname'),      $session->param('branch'),
849
                $session->param('surname'),      $session->param('branch'),
846
                $session->param('branchname'),   $session->param('flags'),
850
                $session->param('branchname'),   $session->param('flags'),
847
                $session->param('emailaddress'),
851
                $session->param('emailaddress'), $session->param('shibboleth'),
848
                $session->param('shibboleth')
852
                $session->param('desk_id'),      $session->param('desk_name')
849
            );
853
            );
850
            C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') );
854
            C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') );
851
            C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') );
855
            C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') );
Lines 1158-1164 sub checkauth { Link Here
1158
                    $session->param('cardnumber'),   $session->param('firstname'),
1162
                    $session->param('cardnumber'),   $session->param('firstname'),
1159
                    $session->param('surname'),      $session->param('branch'),
1163
                    $session->param('surname'),      $session->param('branch'),
1160
                    $session->param('branchname'),   $session->param('flags'),
1164
                    $session->param('branchname'),   $session->param('flags'),
1161
                    $session->param('emailaddress'), $session->param('shibboleth')
1165
                    $session->param('emailaddress'), $session->param('shibboleth'),
1166
                    $session->param('desk_id'),      $session->param('desk_name')
1162
                );
1167
                );
1163
1168
1164
            }
1169
            }
Lines 1435-1441 sub check_api_auth { Link Here
1435
                $session->param('cardnumber'),   $session->param('firstname'),
1440
                $session->param('cardnumber'),   $session->param('firstname'),
1436
                $session->param('surname'),      $session->param('branch'),
1441
                $session->param('surname'),      $session->param('branch'),
1437
                $session->param('branchname'),   $session->param('flags'),
1442
                $session->param('branchname'),   $session->param('flags'),
1438
                $session->param('emailaddress')
1443
                $session->param('emailaddress'), $session->param('desk_id'),
1444
                $session->param('desk_name')
1439
            );
1445
            );
1440
1446
1441
            my $ip       = $session->param('ip');
1447
            my $ip       = $session->param('ip');
Lines 1594-1601 sub check_api_auth { Link Here
1594
                $session->param('number'),       $session->param('id'),
1600
                $session->param('number'),       $session->param('id'),
1595
                $session->param('cardnumber'),   $session->param('firstname'),
1601
                $session->param('cardnumber'),   $session->param('firstname'),
1596
                $session->param('surname'),      $session->param('branch'),
1602
                $session->param('surname'),      $session->param('branch'),
1597
                $session->param('branchname'),   $session->param('flags'),
1603
                $session->param('emailaddress'), $session->param('shibboleth'),
1598
                $session->param('emailaddress')
1604
                $session->param('desk_id'),      $session->param('desk_name')
1599
            );
1605
            );
1600
            return ( "ok", $cookie, $sessionID );
1606
            return ( "ok", $cookie, $sessionID );
1601
        } else {
1607
        } else {
Lines 1683-1689 sub check_cookie_auth { Link Here
1683
            $session->param('cardnumber'),   $session->param('firstname'),
1689
            $session->param('cardnumber'),   $session->param('firstname'),
1684
            $session->param('surname'),      $session->param('branch'),
1690
            $session->param('surname'),      $session->param('branch'),
1685
            $session->param('branchname'),   $session->param('flags'),
1691
            $session->param('branchname'),   $session->param('flags'),
1686
            $session->param('emailaddress')
1692
            $session->param('emailaddress'), $session->param('shibboleth'),
1693
            $session->param('desk_id'),      $session->param('desk_name')
1687
        );
1694
        );
1688
1695
1689
        my $ip       = $session->param('ip');
1696
        my $ip       = $session->param('ip');
(-)a/C4/Context.pm (-2 / +5 lines)
Lines 807-813 sub userenv { Link Here
807
  C4::Context->set_userenv($usernum, $userid, $usercnum,
807
  C4::Context->set_userenv($usernum, $userid, $usercnum,
808
                           $userfirstname, $usersurname,
808
                           $userfirstname, $usersurname,
809
                           $userbranch, $branchname, $userflags,
809
                           $userbranch, $branchname, $userflags,
810
                           $emailaddress, $shibboleth);
810
                           $emailaddress, $shibboleth
811
                           $desk_id, $desk_name);
811
812
812
Establish a hash of user environment variables.
813
Establish a hash of user environment variables.
813
814
Lines 818-824 set_userenv is called in Auth.pm Link Here
818
#'
819
#'
819
sub set_userenv {
820
sub set_userenv {
820
    shift @_;
821
    shift @_;
821
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $shibboleth)=
822
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $shibboleth, $desk_id, $desk_name)=
822
    map { Encode::is_utf8( $_ ) ? $_ : Encode::decode('UTF-8', $_) } # CGI::Session doesn't handle utf-8, so we decode it here
823
    map { Encode::is_utf8( $_ ) ? $_ : Encode::decode('UTF-8', $_) } # CGI::Session doesn't handle utf-8, so we decode it here
823
    @_;
824
    @_;
824
    my $var=$context->{"activeuser"} || '';
825
    my $var=$context->{"activeuser"} || '';
Lines 831-836 sub set_userenv { Link Here
831
        #possibly a law problem
832
        #possibly a law problem
832
        "branch"     => $userbranch,
833
        "branch"     => $userbranch,
833
        "branchname" => $branchname,
834
        "branchname" => $branchname,
835
        "desk_id"    => $desk_id,
836
        "desk_name"  => $desk_name,
834
        "flags"      => $userflags,
837
        "flags"      => $userflags,
835
        "emailaddress"     => $emailaddress,
838
        "emailaddress"     => $emailaddress,
836
        "shibboleth" => $shibboleth,
839
        "shibboleth" => $shibboleth,
(-)a/Koha/Template/Plugin/Desks.pm (+122 lines)
Line 0 Link Here
1
package Koha::Template::Plugin::Desks;
2
3
# Copyright (C) BULAC 2020
4
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use Template::Plugin;
23
use base qw( Template::Plugin );
24
25
use C4::Koha;
26
use C4::Context;
27
use Koha::Desks;
28
29
=head1 NAME
30
31
Koha::Template::Plugin::Desks - A module for dealing with desks in templates
32
33
=head1 DESCRIPTION
34
35
This plugin contains getters functions, to fetch all desks a library
36
got or the current one.
37
38
=head2 Methods
39
40
=head3 GetName
41
42
[% Desk.GetName(desk_id) %]
43
44
return desk name or empty string
45
46
=cut
47
48
sub GetName {
49
    my ( $self, $desk_id ) = @_;
50
    my $d = Koha::Desks->search( { desk_id => $desk_id} )->unblessed;
51
    return @$d ? $d->{'desk_name'} : q{};
52
}
53
54
=head3 GetLoggedInDeskId
55
56
[% Desks.GetLoggedInDeskId %]
57
58
return the desk name that is attached to the session or empty string
59
60
=cut
61
62
sub GetLoggedInDeskId {
63
    my ($self) = @_;
64
65
    return C4::Context->userenv ?
66
        C4::Context->userenv->{'desk_id'} :
67
        '';
68
}
69
70
=head3 all
71
72
[% Desks.all %]
73
74
returns all desks existing at the library
75
76
=cut
77
78
sub all {
79
    my ( $self, $params ) = @_;
80
    my $selected = $params->{selected};
81
    my $unfiltered = $params->{unfiltered} || 0;
82
    my $search_params = $params->{search_params} || {};
83
84
    if ( !$unfiltered ) {
85
        $search_params->{only_from_group} = $params->{only_from_group} || 0;
86
    }
87
88
    my $desks = $unfiltered
89
      ? Koha::Desks->search( $search_params, { order_by => ['desk_name'] } )->unblessed
90
      : Koha::Desks->search_filtered( $search_params, { order_by => ['desk_name'] } )->unblessed;
91
92
    for my $d ( @$desks ) {
93
        if (       defined $selected and $d->{desk_id} eq $selected
94
            or not defined $selected and C4::Context->userenv and $d->{branchcode} eq ( C4::Context->userenv->{desk_id} // q{} )
95
        ) {
96
            $d->{selected} = 1;
97
        }
98
    }
99
100
    return $desks;
101
}
102
103
=head3 defined
104
105
[% Desks.defined %]
106
107
return 1 if there is at least a desk defined for the library.
108
109
=cut
110
111
sub defined {
112
    my ( $self ) = @_;
113
    my $desks = Koha::Desks->search()->unblessed;
114
    if (@$desks) {
115
        return 1 ;
116
    }
117
    else {
118
        return 0;
119
    }
120
}
121
122
1;
(-)a/circ/selectdesk.pl (+87 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright (C) 2020 BULAC
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
use CGI qw ( -utf8 );
22
23
use C4::Context;
24
use C4::Output;
25
use C4::Auth qw/:DEFAULT get_session/;
26
use C4::Koha;
27
use Koha::Desks;
28
29
my $query = CGI->new();
30
31
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
32
    {
33
        template_name   => "circ/selectdesk.tt",
34
        query           => $query,
35
        type            => "intranet",
36
        debug           => 1,
37
        authnotrequired => 0,
38
        flagsrequired   => { catalogue => 1, },
39
    }
40
);
41
42
my $sessionID = $query->cookie("CGISESSID");
43
my $session   = get_session($sessionID);
44
45
my $branch = C4::Context->userenv->{'branch'};
46
my $searchfield = $query->param('searchfield');
47
my $desks_lists;
48
if ($branch) {
49
    $desks_lists = Koha::Desks->search( { branchcode => $branch } )->unblessed;
50
}
51
else {
52
    $desks_lists = Koha::Desks->search( )->unblessed;
53
}
54
55
my $desk_id = $query->param('desk_id');
56
57
my $userenv_desk = C4::Context->userenv->{'desk_id'} || '';
58
my $updated = '';
59
60
if ($desk_id) {
61
    if ( !$userenv_desk or $userenv_desk ne $desk_id ) {
62
        my $desk = Koha::Desks->find( { desk_id => $desk_id } );
63
        $template->param( LoginDeskname => $desk->desk_name );
64
        $template->param( LoginDeskid => $desk->desk_id );
65
        $session->param( desk_name => $desk->desk_name );
66
        $session->param( desk_id => $desk->desk_id );
67
        $updated = 1;
68
    }
69
}
70
else {
71
    $desk_id = $userenv_desk;
72
}
73
74
$template->param( updated => \$updated );
75
76
my $referer = $query->param('oldreferer') || $ENV{HTTP_REFERER};
77
if ($updated) {
78
    print $query->redirect( $referer || '/cgi-bin/koha/mainpage.pl' );
79
}
80
81
$template->param(
82
    referer    => $referer,
83
    desks_list => $desks_lists,
84
    desk_id     => $desk_id,
85
);
86
87
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (+4 lines)
Lines 1-4 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE Desks %]
2
<div id="navmenu">
3
<div id="navmenu">
3
    <div id="navmenulist">
4
    <div id="navmenulist">
4
5
Lines 17-22 Link Here
17
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
18
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
18
                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>
19
                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>
19
            [% END %][% END %]
20
            [% END %][% END %]
21
            [% IF ( Desks.defined ) %]
22
                <li><a href="/cgi-bin/koha/circ/selectdesk.pl">Set desk</a></li>
23
            [% END %]
20
            [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
24
            [% 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>
25
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
22
            [% END %][% END %]
26
            [% END %][% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (+17 lines)
Lines 1-5 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE Desks %]
3
[% USE Koha %]
4
[% USE Koha %]
4
<nav class="navbar">
5
<nav class="navbar">
5
    <div class="navbar-header">
6
    <div class="navbar-header">
Lines 85-90 Link Here
85
                                <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
86
                                <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
86
                            </strong>
87
                            </strong>
87
                        [% END %]
88
                        [% END %]
89
                        [% IF (Desks.defined) %]
90
                            <span class="separator">|</span>
91
                            <strong>
92
                                [% IF ( LoginDeskname == '') %]
93
                                   <span class="logged-in-desk-name">NO DESK SET</span>
94
                                [% ELSE %]
95
                                    <span class="logged-in-desk-name">[% LoginDeskname | html %]</span>
96
                                    <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
97
                                [% END %]
98
                            </strong>
99
                         [% END %]
88
                    </span>
100
                    </span>
89
                    <b class="caret"></b>
101
                    <b class="caret"></b>
90
                </a>
102
                </a>
Lines 118-123 Link Here
118
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
130
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
119
                    </li>
131
                    </li>
120
                    [% END %]
132
                    [% END %]
133
                    [% IF Desks.defined %]
134
                    <li>
135
                        <a class="toplinks" href="/cgi-bin/koha/circ/selectdesk.pl">Set desk</a>
136
                    </li>
137
                    [% END %]
121
                    [% IF EnableSearchHistory %]
138
                    [% IF EnableSearchHistory %]
122
                    <li>
139
                    <li>
123
                        <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>
140
                        <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+6 lines)
Lines 1-6 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE Desks %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Circulation</title>
6
<title>Koha &rsaquo; Circulation</title>
6
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
Lines 33-38 Link Here
33
                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>
34
                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>
34
                        </li>
35
                        </li>
35
                    [% END %]
36
                    [% END %]
37
                    [% IF Desks.defined %]
38
                        <li>
39
                            <a class="circ-button" href="/cgi-bin/koha/circ/selectdesk.pl"><i class="fa fa-location-arrow"></i> Set desk</a>
40
                        </li>
41
                    [% END %]
36
                    [% IF ( fast_cataloging ) %]
42
                    [% IF ( fast_cataloging ) %]
37
                        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
43
                        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
38
                            <li>
44
                            <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectdesk.tt (-1 / +62 lines)
Line 0 Link Here
0
- 
1
[% USE Koha %]
2
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Circulation &rsaquo; Set Desk</title>
5
[% INCLUDE 'doc-head-close.inc' %]
6
</head>
7
<body id="circ_selectdesk" class="circ">
8
[% INCLUDE 'header.inc' %]
9
[% INCLUDE 'circ-search.inc' %]
10
11
<div id="breadcrumbs">
12
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
13
&rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
14
&rsaquo; <a href="/cgi-bin/koha/circ/selectdesk.pl">Set Desk</a>
15
</div>
16
17
<div class="main container-fluid">
18
    <div class="row">
19
        <div class="col-sm-12">
20
            <main>
21
                <div class="row">
22
23
                [% IF Koha.Preference('CircSidebar') %]
24
                    <div class="col-sm-10 col-sm-push-2">
25
                [% ELSE %]
26
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
27
                [% END %]
28
29
<form method="post" action="selectdesk.pl">
30
  <fieldset class="rows">
31
    <legend>Set desk</legend>
32
    <ol>
33
      <li><label for="desk">Choose desk:</label>
34
        <select name="desk_id" id="desk_id">
35
        [% FOREACH desk IN desks_list %]
36
        <option value="[% desk.desk_id|html %]">[% desk.desk_name|html %]</option>
37
        [% END %]
38
        </select>
39
      </li>
40
    </ol>
41
    </fieldset>
42
    <fieldset class="action">
43
      <input type="submit" value="Submit" />
44
      <a class="cancel" id="cancel_set_desk" href="[% referer or '/cgi-bin/koha/circ/circulation.pl'|html %]">Cancel</a>
45
     </fieldset>
46
       <input type="hidden" name="oldreferer" value="[% referer or "/cgi-bin/koha/mainpage.pl" |html %]" />
47
 </form>
48
49
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
50
                    [% IF Koha.Preference('CircSidebar') %]
51
                            <div class="col-sm-2 col-sm-pull-10">
52
                                <aside>
53
                                    [% INCLUDE 'circ-nav.inc' %]
54
                                </aside>
55
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
56
                    [% END %]
57
                </div> <!-- /.row -->
58
            </main>
59
        </div> <!-- /.col-sm-12 -->
60
    </div> <!-- /.row -->
61
62
[% INCLUDE 'intranet-bottom.inc' %]

Return to bug 24201