Attachment 49932 Details for Bug 16055 – [PASSED QA] Bug 16055: Do not allow basketgroup deletion unless empty

[patch] [PASSED QA] Bug 16055: Do not allow basketgroup deletion unless empty

PASSED-QA-Bug-16055-Do-not-allow-basketgroup-delet.patch (text/plain), 3.99 KB, created by Katrin Fischer on 2016-04-05 21:45:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2016-04-05 21:45:45 UTC

Size: 3.99 KB

patch

obsolete

>From 3a606504e7ea37100dfce4d09c59e23f917b436e Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 5 Apr 2016 09:13:05 +0100
>Subject: [PATCH] [PASSED QA] Bug 16055: Do not allow basketgroup deletion
> unless empty
>
>If a basketgroup has basket attached, it should not be deletable.
>This patch just removes the Delete button from the interface if it
>cannot be deleted.
>When editing a basketgroup, the "Delete basket group" button is no
>longer displayed.
>
>Test plan:
>1/ Create a basketgroup
>2/ Attach 1+ baskets to this basketgroup
>3/ Confirm you are not able to delete it
>4/ Remove the baskets from this basketgroup
>5/ Confirm you are able to delete it
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index e2dac37..4834ccb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -146,8 +146,6 @@ function submitForm(form) {
>                             <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
>                             <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="icon-download"></i>Generate edifact order</a></div>
>                         </div>
>-                    [% ELSE %]
>-                        <div class="btn-group"><a href="[% script_name %]?op=delete&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="delbutton"><i class="fa fa-remove"></i> Delete basket group</a></div>
>                     [% END %]
>                     [% IF (name && closedbg) %]
>                         <h1>Basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
>@@ -341,7 +339,9 @@ function submitForm(form) {
>                                                 <td>
>                                                     <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and export as PDF" />
>                                                     <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
>+                                                    [% UNLESS basketgroup.basketsqty %]
>+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
>+                                                    [% END %]
>                                                 </td>
>                                             </tr>
>                                         [% END %]
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 16055: 49897 | 49925 | 49932