LenaSYS

Merge lp:~gustav-hartvigsson/lenasys/bug1176808 into lp:lenasys

  1. bug1176808
  2. Merge into trunk
Proposed by Gustav Hartvigsson
Status: Merged
Merged at revision: 56
Proposed branch: lp:~gustav-hartvigsson/lenasys/bug1176808
Merge into: lp:lenasys
Diff against target: 66 lines (+8/-8)
1 file modified
codeigniter/application/models/admin/admin_model.php (+8/-8)
To merge this branch: bzr merge lp:~gustav-hartvigsson/lenasys/bug1176808
Reviewer Review Type Date Requested Status
Erik Wikström (community) Approve
Review via email: mp+162855@code.launchpad.net

Description of the change

Fixed the admin panel...
I hope...

To post a comment you must log in.
Revision history for this message
Erik Wikström (wikxen) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'codeigniter/application/models/admin/admin_model.php'
2--- codeigniter/application/models/admin/admin_model.php 2013-05-05 16:58:25 +0000
3+++ codeigniter/application/models/admin/admin_model.php 2013-05-07 18:02:23 +0000
4@@ -30,16 +30,16 @@
5
6 function getMenu(){
7 $menu = array();
8- $courses = $this->db->get("courses");
9+ $courses = $this->db->get("Courses");
10 foreach ($courses->result() as $course) {
11 $menu[$course->name] = array();
12 $menu[$course->name]['CID'] = $course->courseID;
13- $categories = $this->db->get_where("categories", array("courseID" => $course->courseID));
14+ $categories = $this->db->get_where("Categories", array("courseID" => $course->courseID));
15
16 foreach($categories->result() as $category){
17 $menu[$course->name][$category->categoryName] = array();
18
19- $subcategories = $this->db->get_where("subcategories", array("courseID" => $course->courseID, "categoryName" => $category->categoryName));
20+ $subcategories = $this->db->get_where("SubCategories", array("courseID" => $course->courseID, "categoryName" => $category->categoryName));
21
22 foreach($subcategories->result() as $subcategory){
23 $menu[$course->name][$category->categoryName][$subcategory->subCategoryName] = array();
24@@ -74,13 +74,13 @@
25 }
26
27 function getSubCategories($cid, $categoryName) {
28- $query = $this->db->get_where('subcategories', array("courseID" => $cid, "categoryName" => $categoryName));
29+ $query = $this->db->get_where('SubCategories', array("courseID" => $cid, "categoryName" => $categoryName));
30 return $query->result();
31 }
32
33 function addSubCategory($cid, $categoryName, $subCategoryName){
34 $this->db->select_max("orderNr");
35- $query = $this->db->get_where('subcategories', array("courseID" => $cid, "categoryName" => $categoryName));
36+ $query = $this->db->get_where('SubCategories', array("courseID" => $cid, "categoryName" => $categoryName));
37
38 $result = $query->result();
39 $data = array(
40@@ -90,7 +90,7 @@
41 'orderNr' => $result[0]->orderNr+1
42 );
43
44- $this->db->insert('subcategories', $data);
45+ $this->db->insert('SubCategories', $data);
46 mkdir("../courses/".$cid."/".$categoryName."/".$subCategoryName);
47
48 }
49@@ -107,7 +107,7 @@
50
51 function addExample($cid, $categoryName, $subCategoryName, $example, $description){
52 $this->db->select_max("orderNr");
53- $query = $this->db->get_where('examples', array("courseID" => $cid, "categoryName" => $categoryName, "subCategoryName" => $subCategoryName));
54+ $query = $this->db->get_where('Examples', array("courseID" => $cid, "categoryName" => $categoryName, "subCategoryName" => $subCategoryName));
55 $result = $query->result();
56 $data = array(
57 'courseID' => $cid ,
58@@ -177,7 +177,7 @@
59 $this->db->insert('Files', $data);
60
61 $this->db->select_max("orderNr");
62- $query = $this->db->get_where('containers', array("courseID" => $cid, "categoryName" => $categoryName, "subCategoryName" => $subCategoryName, "exampleName" => $example, "columnNr" => $file->columnNr));
63+ $query = $this->db->get_where('Containers', array("courseID" => $cid, "categoryName" => $categoryName, "subCategoryName" => $subCategoryName, "exampleName" => $example, "columnNr" => $file->columnNr));
64 $result = $query->result();
65
66 $data = array(

Subscribers

People subscribed via source and target branches