/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to codeigniter/application/controllers/cms.php

  • Committer: a11emmjo
  • Date: 2013-05-26 14:29:27 UTC
  • mfrom: (103 lenasys_b)
  • mto: This revision was merged to the branch mainline in revision 104.
  • Revision ID: a11emmjo@student.his.se-20130526142927-6jq83th03oizbnbw
Updated branch.

Updated getActiveCourse in user-model, and fixed so bannermenu- and cms-view uses it.
Removed links from bannermenu-view.
Fixed so cms is loaded in home-controller when user is logged in.
Added function for expand collapse courses in bannermenu-view.

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/controllers/cms.php
50
50
                        $activeCourse = $this->user->getActiveCourse();
51
51
                        //Creates an array with all courses.
52
52
                        $courses = $this->admin_model->getCourses();
53
 
                        $categories = $this->admin_model->getCategories('DA525G');
 
53
                        $categories = $this->admin_model->getCategories($activeCourse);
54
54
                        //Creates an array with the variables that the bannermenu-view is expecting.
55
55
                        $data = array(
56
56
                                'userType' => $userType,