Bugzilla – Attachment 41986 Details for
Bug 14544
Move the list related code to Koha::Virtualshelves
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14544: Fix regression on adding a new list
Bug-14544-Fix-regression-on-adding-a-new-list.patch (text/plain), 5.33 KB, created by
Jonathan Druart
on 2015-08-26 13:36:57 UTC
(
hide
)
Description:
Bug 14544: Fix regression on adding a new list
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-08-26 13:36:57 UTC
Size:
5.33 KB
patch
obsolete
>From 1cf80e8feb158740a88475ef8ba5797ccced007d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 26 Aug 2015 14:24:25 +0100 >Subject: [PATCH] Bug 14544: Fix regression on adding a new list > >The user should not be allowed to create a new list and get a friendly >error message if he tries. > >The "New list" links are removed. >--- > .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 15 ++++++-- > opac/opac-shelves.pl | 45 ++++++++++++---------- > 2 files changed, 37 insertions(+), 23 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index 2f25d9c..27660d80 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -132,6 +132,8 @@ > This item does not exist. > [% CASE 'unauthorized_on_view' %] > You do not have permission to view this list. >+ [% CASE 'unauthorized_on_insert' %] >+ You do not have permission to insert a new list. > [% CASE 'unauthorized_on_update' %] > You do not have permission to update this list. > [% CASE 'unauthorized_on_delete' %] >@@ -637,8 +639,15 @@ > <div id="publicshelves" class="ui-tabs-panel ui-widget-content ui-corner-bottom" style="display:block;"> > [% END %] > >- <div id="toolbar" class="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a></div> >- [% IF shelves %] >+ [% IF loggedinusername %] >+ <div id="toolbar" class="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a></div> >+ [% ELSE %] >+ [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >+ <div class="alert alert-info"><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new lists.</div> >+ [% END %] >+ [% END %] >+ >+ [% IF shelves.count %] > <table class="table"> > <thead> > <tr> >@@ -701,7 +710,7 @@ > [% ELSE %] > [% IF category == PUBLIC %] > <p>No public lists.</p> >- [% ELSE %] >+ [% ELSIF loggedinusernumber %] > <p>No private lists.</p> > [% END %] > [% END %] >diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl >index 63dc402..e4e4eaa 100755 >--- a/opac/opac-shelves.pl >+++ b/opac/opac-shelves.pl >@@ -63,27 +63,32 @@ if ( $op eq 'add_form' ) { > push @messages, { type => 'error', code => 'does_not_exist' }; > } > } elsif ( $op eq 'add' ) { >- eval { >- $shelf = Koha::Virtualshelf->new( >- { shelfname => $query->param('shelfname'), >- sortfield => $query->param('sortfield'), >- category => $query->param('category') || 1, >- allow_add => $query->param('allow_add'), >- allow_delete_own => $query->param('allow_delete_own'), >- allow_delete_other => $query->param('allow_delete_other'), >- owner => $query->param('owner'), >- } >- ); >- $shelf->store; >- $shelfnumber = $shelf->shelfnumber; >- }; >- if ($@) { >- push @messages, { type => 'error', code => ref($@), msg => $@ }; >- } elsif ( not $shelf ) { >- push @messages, { type => 'error', code => 'error_on_insert' }; >+ if ( $loggedinuser ) { >+ eval { >+ $shelf = Koha::Virtualshelf->new( >+ { shelfname => $query->param('shelfname'), >+ sortfield => $query->param('sortfield'), >+ category => $query->param('category') || 1, >+ allow_add => $query->param('allow_add'), >+ allow_delete_own => $query->param('allow_delete_own'), >+ allow_delete_other => $query->param('allow_delete_other'), >+ owner => $loggedinuser, >+ } >+ ); >+ $shelf->store; >+ $shelfnumber = $shelf->shelfnumber; >+ }; >+ if ($@) { >+ push @messages, { type => 'error', code => ref($@), msg => $@ }; >+ } elsif ( not $shelf ) { >+ push @messages, { type => 'error', code => 'error_on_insert' }; >+ } else { >+ push @messages, { type => 'message', code => 'success_on_insert' }; >+ $op = 'view'; >+ } > } else { >- push @messages, { type => 'message', code => 'success_on_insert' }; >- $op = 'view'; >+ push @messages, { type => 'error', code => 'unauthorized_on_insert' }; >+ $op = 'list'; > } > } elsif ( $op eq 'edit' ) { > $shelfnumber = $query->param('shelfnumber'); >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14544
:
41034
|
41035
|
41036
|
41037
|
41038
|
41039
|
41040
|
41041
|
41042
|
41403
|
41404
|
41405
|
41406
|
41407
|
41408
|
41409
|
41410
|
41411
|
41412
|
41584
|
41585
|
41586
|
41587
|
41588
|
41589
|
41590
|
41591
|
41592
|
41593
|
41594
|
41595
|
41596
|
41597
|
41598
|
41599
|
41600
|
41601
|
41716
|
41717
|
41718
|
41719
|
41720
|
41721
|
41722
|
41723
|
41724
|
41725
|
41726
|
41727
|
41728
|
41729
|
41730
|
41731
|
41732
|
41733
|
41766
|
41909
|
41910
|
41913
|
41914
|
41915
|
41917
|
41918
|
41919
|
41924
|
41927
|
41931
|
41932
|
41953
|
41954
|
41955
|
41956
|
41957
|
41958
|
41959
|
41960
|
41961
|
41962
|
41963
|
41964
|
41965
|
41966
|
41967
|
41968
|
41969
|
41970
|
41973
|
41974
|
41975
|
41976
|
41977
|
41978
|
41979
|
41980
|
41981
|
41982
|
41983
|
41986
|
41988
|
42192
|
42199
|
42200
|
42201
|
42202
|
42203
|
42204
|
42205
|
42206
|
42207
|
42208
|
42209
|
42210
|
42211
|
42212
|
42213
|
42214
|
42215
|
42216
|
42217
|
42218
|
42219
|
42638
|
43223
|
43224
|
43225
|
43226
|
43227
|
43228
|
43229
|
43230
|
43231
|
43232
|
43233
|
43234
|
43235
|
43236
|
43237
|
43238
|
43239
|
43240
|
43241
|
43242
|
43243
|
43296
|
43334
|
43335
|
43403
|
43456
|
43457
|
43458
|
43459
|
43460
|
43461
|
43462
|
43463
|
43464
|
43465
|
43466
|
43467
|
43469
|
43470
|
43471
|
43472
|
43473
|
43474
|
43475
|
43476
|
43477
|
43478
|
43479
|
43480
|
43481
|
43482
|
43485
|
43486
|
43487
|
44467
|
44468
|
44469
|
44470
|
44471
|
44472
|
44473
|
44474
|
44475
|
44476
|
44477
|
44478
|
44479
|
44480
|
44481
|
44482
|
44483
|
44484
|
44485
|
44486
|
44487
|
44758
|
44845
|
44852
|
44863
|
44872