Fix up new feature

unikent · Aug 26, 2015 · b0041d0 · b0041d0
1 parent 25db206
commit b0041d0
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 10 deletions.
diff --git a/classes/category.php b/classes/category.php
@@ -46,15 +46,38 @@ public function __construct($categoryid) {
         $this->_categoryid = $categoryid;
     }
 
+    /**
+     * Returns an item from the recycle bin.
+     *
+     * @param $item int Item ID to retrieve.
+     */
+    public function get_item($itemid) {
+        global $DB;
+
+        $item = $DB->get_record('local_recyclebin_category', array(
+            'id' => $itemid
+        ), '*', MUST_EXIST);
+
+        $item->name = get_course_display_name_for_list($item);
+
+        return $item;
+    }
+
     /**
      * Returns a list of items in the recycle bin for this course.
      */
     public function get_items() {
         global $DB;
 
-        return $DB->get_records('local_recyclebin_category', array(
+        $items = $DB->get_records('local_recyclebin_category', array(
             'category' => $this->_categoryid
         ));
+
+        foreach ($items as $item) {
+            $item->name = get_course_display_name_for_list($item);
+        }
+
+        return $items;
     }
 
     /**
@@ -241,7 +264,7 @@ public function delete_item($item, $noevent = false) {
         // Fire event.
         $event = \local_recyclebin\event\course_purged::create(array(
             'objectid' => $item->id,
-            'context' => \context_course::instance($item->course)
+            'context' => \context_coursecat::instance($item->category)
         ));
         $event->add_record_snapshot('local_recyclebin_category', $item);
         $event->trigger();

diff --git a/classes/course.php b/classes/course.php
@@ -46,6 +46,19 @@ public function __construct($courseid) {
         $this->_courseid = $courseid;
     }
 
+    /**
+     * Returns an item from the recycle bin.
+     *
+     * @param $item int Item ID to retrieve.
+     */
+    public function get_item($itemid) {
+        global $DB;
+
+        return $DB->get_record('local_recyclebin_course', array(
+            'id' => $itemid
+        ), '*', MUST_EXIST);
+    }
+
     /**
      * Returns a list of items in the recycle bin for this course.
      */

diff --git a/classes/recyclebin.php b/classes/recyclebin.php
@@ -36,7 +36,14 @@
 abstract class recyclebin
 {
     /**
-     * Returns a list of items in the recycle bin for this course.
+     * Returns an item from the recycle bin.
+     *
+     * @param $item int Item ID to retrieve.
+     */
+    public abstract function get_item($itemid);
+
+    /**
+     * Returns a list of items in the recycle bin.
      */
     public abstract function get_items();
 

diff --git a/index.php b/index.php
@@ -83,9 +83,7 @@
     $item = null;
     if ($action == 'restore' || $action == 'delete') {
         $itemid = required_param('itemid', PARAM_INT);
-        $item = $DB->get_record('local_recyclebin_course', array(
-            'id' => $itemid
-        ), '*', MUST_EXIST);
+        $item = $recyclebin->get_item($itemid);
     }
 
     switch ($action) {
@@ -185,16 +183,13 @@
     $row = array();
 
     // Build item name.
-    $name = '';
+    $name = $item->name;
     if ($context->contextlevel == \CONTEXT_COURSE) {
-        $name = $item->name;
         if (isset($modules[$item->module])) {
             $mod = $modules[$item->module];
             $modname = get_string('modulename', $mod->name);
             $name = '<img src="' . $OUTPUT->pix_url('icon', $mod->name) . '" class="icon" alt="' . $modname . '" /> ' . $name;
         }
-    } else {
-        $name = get_course_display_name_for_list($item);
     }
 
     $row[] = $name;