Changeset 770 for trunk/app/controllers
- Timestamp:
- 09/18/08 20:19:40 (2 months ago)
- Files:
-
- 1 modified
-
trunk/app/controllers/wikis_controller.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/controllers/wikis_controller.php
r766 r770 61 61 62 62 $this->set('subjects', Set::combine($this->Wiki->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title")); 63 63 $this->set('vclassrooms', Set::combine($this->Wiki->Vclassroom->find('all', array('order'=>'name', 'conditions'=>array('Vclassroom.user_id'=>$this->Auth->user('id'), 'Vclassroom.status'=>1))), "{n}.Vclassroom.id","{n}.Vclassroom.name")); 64 64 65 if ( !empty($this->data['Wiki']) ): 65 66 … … 100 101 101 102 $this->set('subjects', Set::combine($this->Wiki->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title")); 102 103 //$this->set('subjects', Set::combine($this->Wiki->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title")); 103 $this->set('vclassrooms', Set::combine($this->Wiki->Vclassroom->find('all', array('order'=>'name', 'conditions'=>array('Vclassroom.user_id'=>$this->Auth->user('id'), 'Vclassroom.status'=>1))), "{n}.Vclassroom.id","{n}.Vclassroom.name")); 104 104 105 105 if (empty($this->data['Wiki'])):
