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

(-)a/C4/VirtualShelves.pm (+1 lines)
Lines 334-339 sub AddShelf { Link Here
334
        $hashref->{allow_add}//0,
334
        $hashref->{allow_add}//0,
335
        $hashref->{allow_delete_own}//1,
335
        $hashref->{allow_delete_own}//1,
336
        $hashref->{allow_delete_other}//0 );
336
        $hashref->{allow_delete_other}//0 );
337
    return if $sth->err;
337
    my $shelfnumber = $dbh->{'mysql_insertid'};
338
    my $shelfnumber = $dbh->{'mysql_insertid'};
338
    return $shelfnumber;
339
    return $shelfnumber;
339
}
340
}
(-)a/C4/VirtualShelves/Page.pm (-2 / +4 lines)
Lines 337-343 sub shelfpage { Link Here
337
        #Add a shelf
337
        #Add a shelf
338
            if ( my $newshelf = $query->param('addshelf') ) {
338
            if ( my $newshelf = $query->param('addshelf') ) {
339
339
340
                # note: a user can always add a new shelf
340
                # note: a user can always add a new shelf (except kohaadmin)
341
                my $shelfnumber = AddShelf( {
341
                my $shelfnumber = AddShelf( {
342
                    shelfname => $newshelf,
342
                    shelfname => $newshelf,
343
                    sortfield => $query->param('sortfield'),
343
                    sortfield => $query->param('sortfield'),
Lines 348-354 sub shelfpage { Link Here
348
                    },
348
                    },
349
                    $query->param('owner') );
349
                    $query->param('owner') );
350
                $stay = 1;
350
                $stay = 1;
351
                if ( $shelfnumber == -1 ) {    #shelf already exists.
351
                if( !$shelfnumber ) {
352
                    push @paramsloop, { addshelf_failed => 1 };
353
                } elsif ( $shelfnumber == -1 ) {    #shelf already exists.
352
                    $showadd = 1;
354
                    $showadd = 1;
353
                    push @paramsloop, { already => $newshelf };
355
                    push @paramsloop, { already => $newshelf };
354
                    $template->param( shelfnumber => $shelfnumber );
356
                    $template->param( shelfnumber => $shelfnumber );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (+1 lines)
Lines 228-233 function placeHold () { Link Here
228
<div class="yui-ge">
228
<div class="yui-ge">
229
    <div class="yui-u first">
229
    <div class="yui-u first">
230
        [% IF ( paramsloo.already ) %]<div class="dialog alert">A List named [% paramsloo.already %] already exists!</div>[% END %]
230
        [% IF ( paramsloo.already ) %]<div class="dialog alert">A List named [% paramsloo.already %] already exists!</div>[% END %]
231
        [% IF ( paramsloo.addshelf_failed ) %]<div class="dialog alert">List could not be created. [% IF loggedinuser==0 %](Do not use the database administrator account.)[% END %]</div>[% END %]
231
		[% IF ( paramsloo.status ) %]<div class="dialog alert">[% paramsloo.string %]</div>[% END %]
232
		[% IF ( paramsloo.status ) %]<div class="dialog alert">[% paramsloo.string %]</div>[% END %]
232
		[% IF ( paramsloo.nobarcode ) %]<div class="dialog alert">ERROR: No barcode given.</div>[% END %] 
233
		[% IF ( paramsloo.nobarcode ) %]<div class="dialog alert">ERROR: No barcode given.</div>[% END %] 
233
		[% IF ( paramsloo.noshelfnumber ) %]<div class="dialog alert">ERROR: No shelfnumber given.</div>[% END %] 
234
		[% IF ( paramsloo.noshelfnumber ) %]<div class="dialog alert">ERROR: No shelfnumber given.</div>[% END %] 
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (+1 lines)
Lines 109-114 Link Here
109
                    [% IF ( paramsloop ) %]
109
                    [% IF ( paramsloop ) %]
110
                        [% FOREACH paramsloo IN paramsloop %]
110
                        [% FOREACH paramsloo IN paramsloop %]
111
                            [% IF ( paramsloo.already ) %]<div class="alert">A list named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
111
                            [% IF ( paramsloo.already ) %]<div class="alert">A list named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
112
                            [% IF ( paramsloo.addshelf_failed ) %]<div class="dialog alert">List could not be created. [% IF loggedinuser==0 %](Do not use the database administrator account.)[% END %]</div>[% END %]
112
                            [% IF ( paramsloo.status ) %]<div class="alert">[% paramsloo.string %]</div>[% END %]
113
                            [% IF ( paramsloo.status ) %]<div class="alert">[% paramsloo.string %]</div>[% END %]
113
                            [% IF ( paramsloo.nobarcode ) %]<div class="alert">ERROR: No barcode given.</div>[% END %]
114
                            [% IF ( paramsloo.nobarcode ) %]<div class="alert">ERROR: No barcode given.</div>[% END %]
114
                            [% IF ( paramsloo.noshelfnumber ) %]<div class="alert">ERROR: No shelfnumber given.</div>[% END %]
115
                            [% IF ( paramsloo.noshelfnumber ) %]<div class="alert">ERROR: No shelfnumber given.</div>[% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt (-1 / +1 lines)
Lines 261-266 $(document).ready(function() { Link Here
261
                <div class="yui-ge">
261
                <div class="yui-ge">
262
                  <div class="yui-u first">
262
                  <div class="yui-u first">
263
                    [% IF ( paramsloo.already ) %]<div class="dialog alert">A list named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
263
                    [% IF ( paramsloo.already ) %]<div class="dialog alert">A list named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
264
                    [% IF ( paramsloo.addshelf_failed ) %]<div class="dialog alert">List could not be created. [% IF loggedinuser==0 %](Do not use the database administrator account.)[% END %]</div>[% END %]
264
                    [% IF ( paramsloo.status ) %]<div class="dialog alert">[% paramsloo.string %]</div>[% END %]
265
                    [% IF ( paramsloo.status ) %]<div class="dialog alert">[% paramsloo.string %]</div>[% END %]
265
                    [% IF ( paramsloo.nobarcode ) %]<div class="dialog alert">ERROR: No barcode given.</div>[% END %]
266
                    [% IF ( paramsloo.nobarcode ) %]<div class="dialog alert">ERROR: No barcode given.</div>[% END %]
266
                    [% IF ( paramsloo.noshelfnumber ) %]<div class="dialog alert">ERROR: No shelfnumber given.</div>[% END %]
267
                    [% IF ( paramsloo.noshelfnumber ) %]<div class="dialog alert">ERROR: No shelfnumber given.</div>[% END %]
267
- 

Return to bug 8262