Attachment 70933 Details for Bug 19230 – Bug 19230: Preventing warn when deleting course

[patch] Bug 19230: Preventing warn when deleting course

Bug-19230-Preventing-warn-when-deleting-course.patch (text/plain), 3.39 KB, created by Marcel de Rooy on 2018-01-26 07:35:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2018-01-26 07:35:57 UTC

Size: 3.39 KB

patch

obsolete

>From 495364e8dd82c687929ee3b0c513a397c2dcb1b4 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Thu, 21 Dec 2017 00:57:21 +0000
>Subject: [PATCH] Bug 19230: Preventing warn when deleting course
>Content-Type: text/plain; charset=utf-8
>
>To test:
>1) Ensure UseCourseReserves is enabled
>2) Go to Course Reserves, create a course
>3) When you are taken to the course page, you should notice the
>'Argument "" isn't numeric in numeric gt' warn
>4) Delete course
>5) Notice warn, and that no confirm message popped up
>6) Apply patch
>7) Create a course again. Confirm the 'Argument "" isn't numeric in
>numeric gt' warn did not show
>8) Delete the course
>9) Notice no warn and the confirm message pops up
>
>Sponsored-by: Catalyst IT
>Signed-off-by: Roch D'Amour <roch.damour@inlibro.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> course_reserves/mod_course.pl                                | 12 ++++++------
> .../prog/en/modules/course_reserves/course-details.tt        |  3 +++
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/course_reserves/mod_course.pl b/course_reserves/mod_course.pl
>index 844d157..16a959b 100755
>--- a/course_reserves/mod_course.pl
>+++ b/course_reserves/mod_course.pl
>@@ -38,15 +38,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
> );
> 
> my $action = $cgi->param('action') || '';
>+my $course_id = $cgi->param('course_id');
> 
> if ( $action eq 'del' ) {
>-    DelCourse( $cgi->param('course_id') );
>+    DelCourse( $course_id );
>     print $cgi->redirect("/cgi-bin/koha/course_reserves/course-reserves.pl");
> } else {
>     my %params;
> 
>-    $params{'course_id'} = $cgi->param('course_id')
>-      if ( $cgi->param('course_id') );
>+    $params{'course_id'}      = $course_id;
>     $params{'department'}     = $cgi->param('department');
>     $params{'course_number'}  = $cgi->param('course_number');
>     $params{'section'}        = $cgi->param('section');
>@@ -57,13 +57,13 @@ if ( $action eq 'del' ) {
>     $params{'students_count'} = $cgi->param('students_count');
>     $params{'enabled'}        = ( $cgi->param('enabled') eq 'on' ) ? 'yes' : 'no';
> 
>-    my $course_id = ModCourse(%params);
>+    my $new_course_id = ModCourse(%params);
> 
>     my @instructors = $cgi->multi_param('instructors');
>     ModCourseInstructors(
>         mode        => 'replace',
>         cardnumbers => \@instructors,
>-        course_id   => $course_id
>+        course_id   => $new_course_id
>     );
>-    print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=$course_id");
>+    print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=$new_course_id");
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>index 9a8ed8c..bec2e9f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>@@ -210,6 +210,9 @@
> 
>             $("#delete_course").click(function(){
>                 [% SET count = course_reserves.size %]
>+                [% UNLESS count %]
>+                    [% count = 0 %]
>+                [% END %]
>                 [% IF count == 1 %]
>                     return confirmDelete(_("Are you sure you want to delete this course? There is [% count %] attached item.") );
>                 [% ELSIF count > 1 %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19230: 66678 | 67797 | 69946 | 69985 | 70780 | 70933 | 71067