Bugzilla – Attachment 41407 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: Get rid of ModShelf
Bug-14544-Get-rid-of-ModShelf.patch (text/plain), 4.58 KB, created by
Jonathan Druart
on 2015-08-06 14:32:59 UTC
(
hide
)
Description:
Bug 14544: Get rid of ModShelf
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-08-06 14:32:59 UTC
Size:
4.58 KB
patch
obsolete
>From eea9b9404a6bf0be26d2ab71272b2cbc7faf4847 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 15 Jul 2015 17:26:09 +0100 >Subject: [PATCH] Bug 14544: Get rid of ModShelf > >--- > C4/VirtualShelves.pm | 56 ----------------------------------------------- > C4/VirtualShelves/Page.pm | 20 ++++++++--------- > 2 files changed, 10 insertions(+), 66 deletions(-) > >diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm >index 6c8c259..c1ad3b4 100644 >--- a/C4/VirtualShelves.pm >+++ b/C4/VirtualShelves.pm >@@ -42,7 +42,6 @@ BEGIN { > @EXPORT = qw( > &GetShelves &GetShelfContents > &AddToShelf >- &ModShelf > &ShelfPossibleAction > &DelFromShelf > &GetBibliosShelves >@@ -307,61 +306,6 @@ sub AddToShelf { > $sth->execute( $shelfnumber ); > } > >-=head2 ModShelf >- >-my $result= ModShelf($shelfnumber, $hashref) >- >-Where $hashref->{column} = param >- >-Modify the value into virtualshelves table with values given >-from hashref, which each key of the hashref should be >-the name of a column of virtualshelves. >-Fields like shelfnumber or owner cannot be changed. >- >-Returns 1 if the action seemed to be successful. >- >-=cut >- >-sub ModShelf { >- my ($shelfnumber,$hashref) = @_; >- my $dbh = C4::Context->dbh; >- >- my $query= "SELECT * FROM virtualshelves WHERE shelfnumber=?"; >- my $sth = $dbh->prepare($query); >- $sth->execute($shelfnumber); >- my $oldrecord= $sth->fetchrow_hashref; >- return 0 unless $oldrecord; #not found? >- >- #initialize missing hash values to silence warnings >- foreach('shelfname','category', 'sortfield', 'allow_add', 'allow_delete_own', 'allow_delete_other' ) { >- $hashref->{$_}= undef unless exists $hashref->{$_}; >- } >- >- #if name or category changes, the name should be tested >- if($hashref->{shelfname} || $hashref->{category}) { >- unless(_CheckShelfName( >- $hashref->{shelfname}//$oldrecord->{shelfname}, >- $hashref->{category}//$oldrecord->{category}, >- $oldrecord->{owner}, >- $shelfnumber )) { >- return 0; #name check failed >- } >- } >- >- #only the following fields from the hash may be changed >- $query= "UPDATE virtualshelves SET shelfname=?, category=?, sortfield=?, allow_add=?, allow_delete_own=?, allow_delete_other=? WHERE shelfnumber=?"; >- $sth = $dbh->prepare($query); >- $sth->execute( >- $hashref->{shelfname}//$oldrecord->{shelfname}, >- $hashref->{category}//$oldrecord->{category}, >- $hashref->{sortfield}//$oldrecord->{sortfield}, >- $hashref->{allow_add}//$oldrecord->{allow_add}, >- $hashref->{allow_delete_own}//$oldrecord->{allow_delete_own}, >- $hashref->{allow_delete_other}//$oldrecord->{allow_delete_other}, >- $shelfnumber ); >- return $@? 0: 1; >-} >- > =head2 ShelfPossibleAction > > ShelfPossibleAction($loggedinuser, $shelfnumber, $action); >diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm >index 8d7bb5f..59d201c 100644 >--- a/C4/VirtualShelves/Page.pm >+++ b/C4/VirtualShelves/Page.pm >@@ -180,17 +180,17 @@ sub shelfpage { > push @paramsloop, { nopermission => $shelfnumber }; > last SWITCH; > } >- my $shelf = { >- shelfname => $query->param('shelfname'), >- sortfield => $query->param('sortfield'), >- allow_add => $query->param('allow_add'), >- allow_delete_own => $query->param('allow_delete_own'), >- allow_delete_other => $query->param('allow_delete_other'), >- }; >- if($query->param('category')) { #optional >- $shelf->{category}= $query->param('category'); >+ my $shelf = Koha::Virtualshelves->find( $shelfnumber ); >+ $shelf->shelfname($query->param('shelfname')); >+ $shelf->sortfield($query->param('sortfield')); >+ $shelf->allow_add($query->param('allow_add')); >+ $shelf->allow_delete_own($query->param('allow_delete_own')); >+ $shelf->allow_delete_other($query->param('allow_delete_other')); >+ if( my $category = $query->param('category')) { #optional >+ $shelf->category($category); > } >- unless(ModShelf($shelfnumber, $shelf )) { >+ eval { $shelf->store }; >+ if ( $@ ) { > push @paramsloop, {modifyfailure => $shelf->{shelfname}}; > last SWITCH; > } >-- >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