Attachment 29512 Details for Bug 12508 – [PASSED QA] Bug 12508: adding an error message if a contract cannot be removed

[patch] [PASSED QA] Bug 12508: adding an error message if a contract cannot be removed

PASSED-QA-Bug-12508-adding-an-error-message-if-a-c.patch (text/plain), 3.67 KB, created by Katrin Fischer on 2014-07-06 16:47:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-07-06 16:47:33 UTC

Size: 3.67 KB

patch

obsolete

>From 61177941dd9e7e229198fd5f4f3393394ea1a86f Mon Sep 17 00:00:00 2001
>From: Yohann Dufour <dufour.yohann@gmail.com>
>Date: Tue, 1 Jul 2014 09:59:36 +0200
>Subject: [PATCH] [PASSED QA] Bug 12508: adding an error message if a contract
> cannot be removed
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If a contract cannot be removed, no errors is displayed. Now, it displays an dialog messag error and the list of contracts.
>
>Test plan:
>1) Log on with a superlibrarian permission
>2) Go on the page acqui/supplier.pl (Acquisitions > Button "New vendor")
>3) Record a vendor with a nonzero "name"
>4) Go on the page admin/aqcontract.pl (click on the "Contracts" item in the menu)
>5) Click on the button "New" > "Contract" and record a new one
>6) Click on "New" > "Basket" and record a basket by selectioning the created contract
>7) Click on the contract name, then click on the "Contracts" item in the left menu
>8) Try to delete this contract, an error is displayed : "Contract has not been deleted. Maybe a basket linked to this contract exists."
>9) Delete the basket linked to the contract
>10) Delete the contract, no errors is displayed
>
>Signed-off-by: Juhani SeppÃ¤lÃ¤ <jseppal@student.uef.fi>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Passes QA script an tests.
>Also tested adding, editing and deleting unused contracts.
>---
> admin/aqcontract.pl                                   | 19 +++++++++++--------
> .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt |  5 +++++
> 2 files changed, 16 insertions(+), 8 deletions(-)
>
>diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
>index ab513e7..43a6b0a 100755
>--- a/admin/aqcontract.pl
>+++ b/admin/aqcontract.pl
>@@ -33,7 +33,7 @@ use C4::Contract;
> my $input          = new CGI;
> my $contractnumber = $input->param('contractnumber');
> my $booksellerid   = $input->param('booksellerid');
>-my $op             = $input->param('op') || '';
>+my $op             = $input->param('op') || 'list';
> 
> my $bookseller = GetBookSellerFromId($booksellerid);
> 
>@@ -132,17 +132,20 @@ elsif ( $op eq 'delete_confirm' ) {
> }
> #DELETE_CONFIRMED: called by delete_confirm, used to effectively confirm deletion of data in DB
> elsif ( $op eq 'delete_confirmed' ) {
>-    $template->param( delete_confirmed => 1 );
>+    my $deleted = DelContract( { contractnumber => $contractnumber } );
> 
>-    DelContract( { contractnumber => $contractnumber } );
>-
>-    print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
>-    exit;
>+    if ( $deleted ) {
>+        print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
>+        exit;
>+    } else {
>+        $template->param( error => 'not_deleted' );
>+        $op = 'list';
>+    }
> 
>-    # END $OP eq DELETE_CONFIRMED
>+    # END $OP eq LIST
> }
> # DEFAULT: Builds a list of contracts and displays them
>-else {
>+if ( $op eq 'list' ) {
>     $template->param(else => 1);
> 
>     # get contracts
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>index 34040bd..b4a6e0c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>@@ -90,6 +90,11 @@ function Check(ff) {
>     <div class="yui-b">
> 
> [% INCLUDE 'acquisitions-toolbar.inc' %]
>+
>+[% IF error == 'not_deleted' %]
>+    <div class="dialog alert">Contract has not been deleted. Maybe a basket linked to this contract exists.</div>
>+[% END %]
>+
>                 [% IF ( add_form ) %]
>                     <form name="Aform" action="[% script_name %]" method="post">
>                         <input type="hidden" name="op" value="add_validate" />
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 12508: 29392 | 29421 | 29512 | 29513