Changeset 632

Timestamp:

07/07/08 22:23:03 (5 months ago)

Author:

aarkerio

Message:

Adding annotations

Location:

trunk/app

Files:

• controllers/annotations_controller.php (modified) (3 diffs)
• controllers/lessons_controller.php (modified) (1 diff)
• models/annotation.php (modified) (2 diffs)
• models/lesson.php (modified) (1 diff)
• views/lessons/view.ctp (modified) (2 diffs)

trunk/app/controllers/annotations_controller.php

@@ -16 +16 @@
  public function add()
  {
-  if (!empty($this->data['CommentsLesson']) ):
+  if (!empty($this->data['Annotation']) ):
       
     $this->Sanitize = new Sanitize;
        
-    $this->Sanitize->clean($this->data['CommentsLesson']); 
-       
-    $this->Comment->create();
-       
-    if ($this->Comment->save($this->data['CommenttsLesson'])):
-           $this->msgFlash(__('Comment added', true), $this->data['CommenttsLesson']['redirect_to'].'/#comments');
+    $this->Sanitize->clean($this->data['Annotation']);
+
+    $this->data['Annotation']['user_id'] = $this->Auth->user('id');  
+     
+    $this->Annotation->create();
+
+    if ($this->Annotation->save($this->data['Annotation'])):
+          $this->msgFlash(__('Comment added', true), $this->data['Annotation']['redirect_to'].'/#comments');
     endif;
  endif;
@@ -33 +35 @@
  
   // change status enabled/disabled actived
-  public function admin_change($comment_id, $status)
+  public function admin_change($annotation_id, $status)
   { 
-    $this->data['Comment']['status'] = ($status == 0 ) ? 1 : 0;
+    $this->data['Annotation']['status'] = ($status == 0 ) ? 1 : 0;
      
-    $this->data['Comment']['id']     = $comment_id;
+    $this->data['Annotation']['id']     = $annotation_id;
       
-    if ($this->Comment->save($this->data['Comment'])):
-      $this->msgFlash('Comment status changed', '/admin/entries/comments');
+    if ($this->Annotation->save($this->data['Annotation'])):
+      $this->msgFlash('Annotation status changed', '/admin/entries/comments');
     endif;
   }
@@ -48 +50 @@
     $this->layout    = 'admin';
      
-    if ( empty( $this->data["Comment"] ) ):
-      $this->data      = $this->Comment->read(null, $id);
+    if ( empty( $this->data["Annotation"] ) ):
+      $this->data      = $this->Annotation->read(null, $id);
     else:
     $this->Sanitize = new Sanitize;
          
-    $this->Sanitize->html($this->data["Comment"]["comment"]);
+    $this->Sanitize->html($this->data["Annotation"]["comment"]);
          
-    if ($this->Comment->save($this->data["Comment"])):  
-      $this->msgFlash('Comment saved!', '/admin/comments/edit/'.$this->data["Comment"]["id"]);
+    if ($this->Annotation->save($this->data["Annotation"])):  
+       $this->msgFlash('Annotation saved!', '/admin/comments/edit/'.$this->data["Annotation"]["id"]);
     endif;
-    endif;
+   endif;
   }
  
-  public function admin_delete($id)
+  public function admin_delete($annotation_id)
   {
-    if ($this->Comment->del($id)):
-       $this->msgFlash('Comment deleted', '/admin/comments/listing');
+    if ($this->Annotation->del($annotation_id)):
+        $this->msgFlash('Annotation deleted', '/admin/comments/listing');
     endif;
   }

trunk/app/controllers/lessons_controller.php

@@ -34 +34 @@
         $this->LessonTitle = 'Lesson';
         
-        $conditions        = array("Lesson.id"=>$id, "Lesson.status"=>1);
+        $conditions        = array('Lesson.id'=>$id, 'Lesson.status'=>1);
         
-        $fields            = array("Lesson.id", "Lesson.title", "Lesson.body", "Lesson.created", "Lesson.modified");
+        $fields            = array('Lesson.id', 'Lesson.title', 'Lesson.body', 'Lesson.created', 'Lesson.modified', 'Annotation.comment');
         
         $order             = null;
         
-        $this->set('data', $this->Lesson->find($conditions, $fields, $order, null, null, 0));
+        $this->set('data', $this->Lesson->find($conditions));
  }
     

trunk/app/models/annotation.php

@@ -13 +13 @@
                   'conditions' => '',
                   'order'      => '',
-                                 'foreignKey' => 'user_id'
+                                 'foreignKey'  => 'user_id'
                   ),
                            'Lesson' =>
@@ -19 +19 @@
                   'conditions' => '',
                   'order'      => null,
-                                 'foreignKey' => 'lersson_id'
+                                  'foreignKey' => 'lesson_id'
                   )
                 );
 
   public $validate = array(
-      'comment' => VALID_NOT_EMPTY,
-      'user_id' => VALID_NOT_EMPTY
+      'comment'   => VALID_NOT_EMPTY,
+      'user_id'   => VALID_NOT_EMPTY,
+      'lesson_id' => VALID_NOT_EMPTY
    );
 /*

trunk/app/models/lesson.php

@@ -25 +25 @@
                 );
 
-  public $hasMany = array('CommentsLesson' =>
-                        array('className'     => 'CommentsLesson',
+  public $hasMany = array('Annotation' =>
+                        array('className'     => 'Annotation',
                   'conditions'    =>  null,
-                  'order'         => 'CommentsLesson.created',
+                  'order'         => 'Annotation.created',
                   'limit'         => null,
                   'foreignKey'    => 'lesson_id',

trunk/app/views/lessons/view.ctp

@@ -1 +1 @@
 <?php
+//die(debug($data));
   echo '<h1>'  .$data['Lesson']['title']   . '</h1>';
   echo $html->div(null, $data['Lesson']['body']);
   echo $html->div(null, __('Last edition', true). ': '.$data['Lesson']['created']);
   
-  echo $form->create('CommentsLesson', array('onsubmit'=>'return chkForm()', 'action'=>'add'));
-  echo $form->hidden('CommentsLesson.redirect_to', array('value'=>'/lessons/view/'.$blog['User']['username'].'/'.$data['Lesson']['id']));
-  echo $form->hidden('CommentsLesson.lesson_id', array('value'=>$data['Lesson']['id']));
+  echo $form->create('Annotation', array('onsubmit'=>'return chkForm()', 'action'=>'add'));
+  echo $form->hidden('Annotation.redirect_to', array('value'=>'/lessons/view/'.$blog['User']['username'].'/'.$data['Lesson']['id']));
+  echo $form->hidden('Annotation.lesson_id', array('value'=>$data['Lesson']['id']));
        
   if ( $session->check('Auth.User') ):
@@ -15 +16 @@
    echo $session->read('Auth.User.username') . ' ' . __('writes', true);
                  
-   echo $form->label('CommentsLesson.comment', 'Comment');
-   echo $form->textarea('CommentsLesson.comment', array('rows' => 10, 'cols' => 50));
-   echo $form->error('CommentsLesson.comment', 'A comment is required.');
+   echo $form->label('Annotation.comment', 'Comment');
+   echo $form->textarea('Annotation.comment', array('rows' => 10, 'cols' => 50));
+   echo $form->error('Annotation.comment', 'A comment is required.');
         
    echo $form->end(__('Send', true));