Bugzilla – Attachment 63509 Details for
Bug 18606
Move rotating collections code to Koha::Object
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18606: Get rid of DeleteCollection
Bug-18606-Get-rid-of-DeleteCollection.patch (text/plain), 3.62 KB, created by
Josef Moravec
on 2017-05-18 09:21:17 UTC
(
hide
)
Description:
Bug 18606: Get rid of DeleteCollection
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2017-05-18 09:21:17 UTC
Size:
3.62 KB
patch
obsolete
>From 49b807bde0616372bb9a8e911957a0c93c95249b Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Fri, 14 Oct 2016 16:38:25 +0200 >Subject: [PATCH] Bug 18606: Get rid of DeleteCollection > >--- > C4/RotatingCollections.pm | 34 --------------------------------- > rotating_collections/editCollections.pl | 33 ++++++++++++++++---------------- > 2 files changed, 17 insertions(+), 50 deletions(-) > >diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm >index 709eaf2..c142d34 100644 >--- a/C4/RotatingCollections.pm >+++ b/C4/RotatingCollections.pm >@@ -50,7 +50,6 @@ BEGIN { > @EXPORT = qw( > CreateCollection > UpdateCollection >- DeleteCollection > > GetItemsInCollection > >@@ -163,39 +162,6 @@ sub UpdateCollection { > > } > >-=head2 DeleteCollection >- >- ( $success, $errorcode, $errormessage ) = DeleteCollection( $colId ); >- Deletes a collection of the given id >- >- Input: >- $colId : id of the Archetype to be deleted >- >- Output: >- $success: 1 if all database operations were successful, 0 otherwise >- $errorCode: Code for reason of failure, good for translating errors in templates >- $errorMessage: English description of error >- >-=cut >- >-sub DeleteCollection { >- my ($colId) = @_; >- >- ## Parameter check >- if ( !$colId ) { >- return ( 0, 1, "NO_ID" ); >- } >- >- my $dbh = C4::Context->dbh; >- >- my $sth; >- >- $sth = $dbh->prepare("DELETE FROM collections WHERE colId = ?"); >- $sth->execute($colId) or return ( 0, 4, $sth->errstr() ); >- >- return 1; >-} >- > =head2 GetCollections > > $collections = GetCollections(); >diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl >index c8ed8ed..3b0e854 100755 >--- a/rotating_collections/editCollections.pl >+++ b/rotating_collections/editCollections.pl >@@ -23,10 +23,13 @@ use CGI qw ( -utf8 ); > use C4::Output; > use C4::Auth; > use C4::Context; >- > use C4::RotatingCollections; > >+use Koha::RotatingCollections; >+ > my $query = new CGI; >+my $action = $query->param('action'); >+my @messages; > > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >@@ -39,9 +42,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >-my $action = $query->param('action'); >-$template->param( action => $action ); >- > # Create new Collection > if ( $action eq 'create' ) { > my $title = $query->param('title'); >@@ -62,21 +62,17 @@ if ( $action eq 'create' ) { > $template->param( createFailure => 1 ); > $template->param( failureMessage => $errorMessage ); > } >-} >- >-## Delete a club or service >-elsif ( $action eq 'delete' ) { >+} elsif ( $action eq 'delete' ) { # Delete collection > my $colId = $query->param('colId'); >- my ( $success, $errorCode, $errorMessage ) = DeleteCollection($colId); >+ my $collection = Koha::RotatingCollections->find($colId); >+ my $deleted = eval { $collection->delete; }; > >- $template->param( previousActionDelete => 1 ); >- if ($success) { >- $template->param( deleteSuccess => 1 ); >- } >- else { >- $template->param( deleteFailure => 1 ); >- $template->param( failureMessage => $errorMessage ); >+ if ( $@ or not $deleted ) { >+ push @messages, { type => 'error', code => 'error_on_delete' }; >+ } else { >+ push @messages, { type => 'message', code => 'success_on_delete' }; > } >+ $action = "list"; > } > > ## Edit a club or service: grab data, put in form. >@@ -114,4 +110,9 @@ elsif ( $action eq 'update' ) { > } > } > >+$template->param( >+ action => $action, >+ messages => \@messages, >+); >+ > output_html_with_http_headers $query, $cookie, $template->output; >-- >2.1.4
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 18606
:
63508
|
63509
|
63510
|
63511
|
63512
|
63513
|
63514
|
63515
|
63516
|
63517
|
63518
|
63519
|
63520
|
63521
|
63522
|
63523
|
63524
|
63525
|
63526
|
63527
|
63528
|
66227
|
66228
|
66229
|
66230
|
66231
|
66232
|
66233
|
66234
|
66235
|
66236
|
66237
|
66238
|
66239
|
66240
|
66241
|
66286
|
66287
|
66288
|
66289
|
66290
|
66291
|
66292
|
66293
|
66294
|
66295
|
66296
|
66297
|
66298
|
66299
|
66300
|
67734
|
67735
|
67736
|
67737
|
67738
|
67739
|
67740
|
67741
|
67742
|
67743
|
67744
|
67745
|
67746
|
67747
|
67748
|
67749
|
68428
|
68429
|
68430
|
68431
|
68432
|
68433
|
68434
|
68435
|
68436
|
68437
|
68438
|
68439
|
68440
|
68441
|
68442
|
68443
|
69709
|
69710
|
69711
|
69712
|
69713
|
69714
|
69715
|
69716
|
69717
|
69718
|
69719
|
69720
|
69721
|
69722
|
69723
|
69759
|
72416
|
72417
|
72418
|
72419
|
72420
|
72421
|
72422
|
72423
|
72424
|
72425
|
72426
|
72427
|
72428
|
72429
|
72430
|
72431
|
72572
|
72573
|
72574
|
72575
|
72576
|
72577
|
72578
|
72579
|
72580
|
72581
|
72582
|
72583
|
72584
|
72585
|
72586
|
72587
|
72816
|
79141
|
79142
|
79143
|
79144
|
79145
|
79146
|
79147
|
79148
|
79149
|
79150
|
79151
|
79152
|
79153
|
79154
|
79155
|
79156
|
79157
|
79158
|
79161