Changeset 770

Timestamp:

09/18/08 20:19:40 (2 months ago)

Author:

aarkerio

Message:

Update wiki

Location:

trunk/app

Files:

• config/sql/postgresql/wikis.sql (modified) (1 diff)
• controllers/wikis_controller.php (modified) (2 diffs)
• models/wiki.php (modified) (2 diffs)
• plugins/wiki/controllers/wikis_controller.php (modified) (2 diffs)
• views/wikis/admin_add.ctp (modified) (1 diff)
• views/wikis/admin_edit.ctp (modified) (1 diff)

trunk/app/config/sql/postgresql/wikis.sql

@@ -8 +8 @@
   user_id int NOT NULL REFERENCES users(id),
   subject_id smallint NOT NULL REFERENCES subjects(id),
+  vclassroom_id int NOT NULL REFERENCES vclassrooms(id),
   ip varchar(15) NOT NULL,
   revision smallint NOT NULL,

trunk/app/controllers/wikis_controller.php

@@ -61 +61 @@
 
    $this->set('subjects', Set::combine($this->Wiki->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
-      
+   $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"));
+
    if ( !empty($this->data['Wiki']) ):
   
@@ -100 +101 @@
     
   $this->set('subjects', Set::combine($this->Wiki->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
-
-  //$this->set('subjects', Set::combine($this->Wiki->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+   $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"));
      
   if (empty($this->data['Wiki'])):

trunk/app/models/wiki.php

@@ -11 +11 @@
   public $name = 'Wiki';
   
-      public $belongsTo = array('User' =>
+  public $belongsTo = array('User' =>
                            array('className'  => 'User',
                                  'conditions' => '',
@@ -22 +22 @@
                                  'order'      => null,
                                  'foreignKey' => 'subject_id'
+                 ),
+                           'Vclassroom' =>
+                               array('className'  => 'Vclassroom',
+                                     'conditions' => '',
+                                     'order'      => null,
+                                     'foreignKey' => 'vclassroom_id'
                            )
-                     );
-
-       /* public $validate = array(
-        'login' => array('alphanumeric' => array(
-                                                 'rule' => 'alphaNumeric',
-                                             'required' => true,
-                                                         'message' => 'Alphabets and numbers only'
-                                   ),
-                                'between' => array(
-                                           'rule' => array('between', 5, 15),
-                                                                               'message' => 'Between 5 to 15 characters'
-                                           )
-                                ),
-                       'password' => array(
-                                   'rule' => array('minLength', '8'),
-                                                               'message' => 'Mimimum 8 characters long'
-                                   ),
-                       'email' => 'email',
-                       'born' => array(
-                               'rule' => 'date',
-                               'message' => 'Enter a valid date',
-                                                           'allowEmpty' => true
-                               )
-                       ); */
+                  );
 }
 ?>

trunk/app/plugins/wiki/controllers/wikis_controller.php

@@ -32 +32 @@
 class WikisController extends WikiAppController {
 
-    var $name = 'Wikis';
-    var $helpers = array('Html', 'Form' );
+ public $name = 'Wikis';
+ public $helpers = array('Html', 'Form' );
 
-    function _setActiveCourse() {
-        if (!isset($this->params['named']['course_id']) && isset($this->params['named']['wiki_id'])) {
-            $this->activeCourse = $this->Wiki->field('course_id', array('id' => $this->params['named']['wiki_id']));
-        } else
-            parent::_setActiveCourse();
-    }
+ public function index() 
+ {
+    $this->Wiki->recursive = 0;
+    $this->set('wikis', $this->paginate());
+ }
 
-    function index() {
-        $this->Wiki->recursive = 0;
-        $this->set('wikis', $this->paginate());
-    }
-
-    function view($id = null) {
-        if (!$id && !isset($this->params['named']['course_id'])) {
-            $this->Session->setFlash(__('Invalid Wiki',true), 'default', array('class' => 'error'));
-            $this->redirect(array('action'=>'index'), null, true);
-        }
-        $wiki = null;
-        $course_id = $this->params['named']['course_id'];
-        $this->Wiki->contain('Entry(id,title,slug,revision,updated)');
+ public function view($id = null) 
+ {
+        $this->Wiki->contain('Entry(id,title,slug,revision,updated)');
         if (!$id){
             $wiki = $this->Wiki->findByCourseId($course_id);
@@ -79 +68 @@
         $main = $this->Wiki->mainPage($wiki['Wiki']['id']);
         $this->set(array('data' => $wiki, 'main' => $main['Entry']));
-    }
+  }
 
-    function add() { 
-        if (!empty($this->data)) {
-            $this->Wiki->create();
-            if ($this->Wiki->save($this->data)) {
-                $this->Session->setFlash(__('The Wiki has been saved', true), 'default', array('class' => 'success'));
-                $this->redirect(array('action'=>'index'), null, true);
-            } else {
-                $this->Session->setFlash(__('The Wiki could not be saved. Please, try again',true), 'default', array('class' => 'error'));
-            }
-        }
-        $courses = @$this->Wiki->Course->generateList();
-        $this->set(compact('courses'));
-    }
+  public function add() 
+  { 
+    if (!empty($this->data)):  
+        if ($this->Wiki->save($this->data)):
+          $this->Session->setFlash(__('The Wiki has been saved', true), 'default', array('class' => 'success'));
+          $this->redirect(array('action'=>'index'), null, true);
+        else:
+          $this->Session->setFlash(__('The Wiki could not be saved. Please, try again',true), 'default', array('class' => 'error'));
+    endif;
+    endif;
+ }
 
-    function edit($id = null) {
-        if (isset($this->params['named']['wiki_id'])) {
-            $id = $this->params['named']['wiki_id'];
-        }
-        if (!$id && empty($this->data)) {
-            $this->Session->setFlash(__('Invalid Wiki',true), 'default', array('class' => 'error'));
-            $this->redirect(array('action'=>'index'), null, true);
-        }
-        if (!empty($this->data)) {
-            if ($this->Wiki->save($this->data)) {
-                $this->Session->setFlash(__('The Wiki has been saved',true), 'default', array('class' => 'success'));
-                $this->redirect(array('action'=>'view', 'course_id' => $this->Wiki->field('course_id')), null, true);
-            } else {
-                $this->Session->setFlash(__('The Wiki could not be saved. Please, try again',true), 'default', array('class' => 'error'));
-            }
-        }
-        if (empty($this->data)) {
-            $this->data = $this->Wiki->read(null, $id);
-        }
-        $this->set(compact('courses'));
-    }
+ public function edit($id = null) 
+ {
+   if (!empty($this->data)):
+     if ($this->Wiki->save($this->data)):
+      $this->Session->setFlash(__('The Wiki has been saved',true), 'default', array('class' => 'success'));
+          $this->redirect(array('action'=>'view', 'course_id' => $this->Wiki->field('course_id')), null, true);
+     else:
+          $this->Session->setFlash(__('The Wiki could not be saved. Please, try again',true), 'default', array('class' => 'error'));
+     endif;
+   else:
+       $this->data = $this->Wiki->read(null, $id);
+   endif;
+  }
 
-    function delete($id = null) {
-        if (!$id) {
-            $this->Session->setFlash(__('Invalid id for Wiki',true), 'default', array('class' => 'error'));
-            $this->redirect(array('action'=>'index'), null, true);
-        }
-        if ($this->Wiki->del($id)) {
-            $this->Session->setFlash(__('Wiki deleted',true), 'default', array('class' => 'error'));
-            $this->redirect(array('action'=>'index'), null, true);
-        }
-    }
-
+ public function delete($wiki_id = null) 
+ {
+   if ($this->Wiki->del($wiki_id)):
+    $this->Session->setFlash(__('Wiki deleted',true), 'default', array('class' => 'error'));
+    $this->redirect(array('action'=>'index'), null, true);
+   endif;
+ }
 }
 ?>

trunk/app/views/wikis/admin_add.ctp

@@ -3 +3 @@
        <legend><?php __('Add Wiki');?></legend>
 <?php  
-echo $html->div('optional',$form->input('Wiki.title', array('size'=>60, 'maxlength'=>80)));
-echo $html->div('optional',$form->label('Wiki.subject_id', __('Subject', true)).$form->select('Wiki.subject_id', $subjects, null, null, false));
-echo $html->div('optional',$form->label('Wiki.content', 'Content').$form->textarea('Wiki.content', array('cols' => 90, 'rows' => 20)));
-echo $html->div('optional',$form->label('Wiki.status', __('Published', true)).$form->checkbox('Wiki.status', array('value'=>1)));
+echo $form->input('Wiki.title', array('size'=>60, 'maxlength'=>80));
+echo $form->label('Wiki.subject_id', __('Subject', true)).$form->select('Wiki.subject_id', $subjects, null, null, false);
+echo $form->label('Wiki.vclassroom_id', __('vGroup', true)).$form->select('Wiki.vclassroom_id', $vclassrooms, null, null, false);
+echo $form->label('Wiki.content', 'Content').$form->textarea('Wiki.content', array('cols' => 90, 'rows' => 20));
+echo $form->label('Wiki.status', __('Published', true)).$form->checkbox('Wiki.status', array('value'=>1));
 
 echo $html->div('submit', $form->end(__('Save', true)));

trunk/app/views/wikis/admin_edit.ctp

@@ -9 +9 @@
 <?php  
 echo $form->input('Wiki.title', array('size' => 60, 'maxlength'=>80));
+
 echo $form->label('Wiki.subject_id', __('Subject', true));
 echo $form->select('Wiki.subject_id', $subjects, null, null, false);
+
+echo $form->label('Wiki.vclassroom_id', __('vGroup', true));
+echo $form->select('Wiki.vclassroom_id', $vclassrooms, null, null, false);
+
 echo $this->element('wikibar');
 echo $form->textarea('Wiki.content', array('cols'=>100,'rows' =>20, 'class'=>'wikitext'));