category MDL-18876 replace error notice by exception, move success notice into index.php

diff --git a/course/index.php b/course/index.php
index a1c1427aba77ae1c278a0f0503db4785e6579c6e..6ea66f7baf401bc952c77478b3ccfececa2452c1 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -117,7 +117,13 @@
         print_heading($heading);
 
         if ($data->fulldelete) {
-            category_delete_full($deletecat, true);
+            $deletedcourses = category_delete_full($deletecat, true);
+            
+            foreach($deletedcourses as $course) {
+                notify(get_string('coursedeleted', '', $course->shortname), 'notifysuccess');
+            }
+            notify(get_string('coursecategorydeleted', '', format_string($deletecat->name)), 'notifysuccess');
+            
         } else {
             category_delete_move($deletecat, $data->newparent, true);
         }

diff --git a/course/lib.php b/course/lib.php
index 1810a5a18dd3433aff6d17ceb6d535080079d01f..f1797b79abbc66695455ee05b18330e38c6e2201 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -3239,8 +3239,9 @@ function course_allowed_module($course,$mod) {
 
 /**
  * Recursively delete category including all subcategories and courses.
- * @param object $ccategory
- * @return bool status
+ * @param object $category
+ * @param boolean $showfeedback display some notices
+ * @return array return deleted courses
  */
 function category_delete_full($category, $showfeedback=true) {
     global $CFG, $DB;
@@ -3249,28 +3250,24 @@ function category_delete_full($category, $showfeedback=true) {
 
     if ($children = $DB->get_records('course_categories', array('parent'=>$category->id), 'sortorder ASC')) {
         foreach ($children as $childcat) {
-            if (!category_delete_full($childcat, $showfeedback)) {
-                notify("Error deleting category $childcat->name");
-                return false;
-            }
+            category_delete_full($childcat, $showfeedback);
         }
     }
 
+    $deletedcourses = array();
     if ($courses = $DB->get_records('course', array('category'=>$category->id), 'sortorder ASC')) {
         foreach ($courses as $course) {
             if (!delete_course($course, false)) {
-                notify("Error deleting course $course->shortname");
-                return false;
+                throw new moodle_exception('cannotdeletecategorycourse','','',$course->shortname);
             }
-            notify(get_string('coursedeleted', '', $course->shortname), 'notifysuccess');
+            $deletedcourses[] = $course;
         }
     }
 
     // now delete anything that may depend on course category context
     grade_course_category_delete($category->id, 0, $showfeedback);
     if (!question_delete_course_category($category, 0, $showfeedback)) {
-        notify(get_string('errordeletingquestionsfromcategory', 'question', $category), 'notifysuccess');
-        return false;
+        throw new moodle_exception('cannotdeletecategoryquestions','','',$category->name);
     }
 
     // finally delete the category and it's context
@@ -3279,9 +3276,7 @@ function category_delete_full($category, $showfeedback=true) {
 
     events_trigger('course_category_deleted', $category);
 
-    notify(get_string('coursecategorydeleted', '', format_string($category->name)), 'notifysuccess');
-
-    return true;
+    return $deletedcourses; 
 }
 
 /**

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index 52f7d899f67821ca76cf5554805e092330607738..49f1cc8933dca8e2400a2d223ca88e14a84afbe4 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -46,6 +46,8 @@ $string['cannotdeletelangcache'] = 'Language cache cannot be deleted, please fix
 $string['cannotdeletebackupids'] = 'Couldn\'t delete previous backup ids';
 $string['cannotdeletecap'] = 'Could not delete deprecated capability $a';
 $string['cannotdeletecate'] = 'Error while deleting category';
+$string['cannotdeletecategorycourse'] = 'Course \'$a\' failed to be deleted.';
+$string['cannotdeletecategoryquestions'] = 'Could not delete questions from category \'$a\'';
 $string['cannotdeletecourse'] = 'You do not have the permission to delete this course';
 $string['cannotdeletecustomfield'] = 'Error deleting custom field data';
 $string['cannotdeletedir'] = 'Cannot delete ($a)';