Changeset 638

Timestamp:

07/10/08 18:28:49 (3 months ago)

Author:

aarkerio

Message:

Litle changes

Location:

trunk/app

Files:

• controllers/annotations_controller.php (modified) (3 diffs)
• controllers/lessons_controller.php (modified) (2 diffs)
• views/lessons/admin_listing.ctp (modified) (1 diff)

trunk/app/controllers/annotations_controller.php

@@ -14 +14 @@
 class AnnotationsController extends AppController {
 
+ public $paginate = array('limit' => 20, 'page' => 1);
+
  public function add()
  {
@@ -26 +28 @@
     $this->Annotation->create();
 
-    if ($this->Annotation->save($this->data['Annotation'])):
+    if ($this->Annotation->save($this->data)):
           $this->msgFlash(__('Comment added', true), $this->data['Annotation']['redirect_to'].'/#comments');
     endif;
@@ -32 +34 @@
  }  
 
-  /**    ===== ADMIN METHODS ====== **/
+ /**    ===== ADMIN METHODS ====== **/
+ public function admin_listing()
+ {   
+   $this->layout                  = 'admin';
+        
+   $this->PageTitle               = __('Comments', true);
+        
+   $this->paginate['conditions']  = array('Lesson.user_id'=>$this->Auth->user('id'));
+   
+   $this->paginate['fields']      = array("id", "comment", "created", "user_id", "status");
+            
+   $this->paginate['order']       = array('Annotation.id' => 'DESC');
+
+   $data = $this->paginate('Annotation');
+     
+   $this->set(compact('data'));
+ }
  
   // change status enabled/disabled actived

trunk/app/controllers/lessons_controller.php

@@ -66 +66 @@
  }
     
-    /***   === ADMIN METHODS   ****/
-    public function admin_listing()
-    {   
-        $this->layout    = 'admin';
+ /***   === ADMIN METHODS   ****/
+ public function admin_listing()
+ {   
+   $this->layout    = 'admin';
         
-        $this->LessonTitle = 'Lessons';
+   $this->PageTitle = __('Lessons', true);
         
-        $conditions = array("Lesson.user_id"=>$this->Auth->user('id'));
-        
-        $fields     = array("id", "title", "status", "created");
-        
-        $order      = null;
-        
-        $data       = $this->Lesson->findAll($conditions, $fields, $order, null, null, 1);
-        
-        $this->set('data', $data);
-    }
+   $this->paginate['conditions']  = array('Lesson.user_id'=>$this->Auth->user('id'));
    
-   
-   public function admin_add()
-   {
+   $this->paginate['fields']      = array("id", "title", "created", "user_id", "status");
+            
+   $this->paginate['order']       = array('Lesson.id' => 'DESC');
+
+   $data = $this->paginate('Lesson');
+     
+   $this->set(compact('data'));
+ }
+
+ public function admin_add()
+ {
     $this->layout    = 'admin';
     
@@ -101 +100 @@
        $this->data['Lesson']['user_id'] = $this->Auth->user('id');; 
         
-       if ($this->Lesson->save($this->data['Lesson'])):
+       if ($this->Lesson->save($this->data)):
            $this->msgFlash('Lesson saved', '/admin/lessons/edit/'.$this->Lesson->getLastInsertID());
        endif;

trunk/app/views/lessons/admin_listing.ctp

@@ -11 +11 @@
 echo $html->tableHeaders($th);
 
-foreach ($data as $val)
-{      
-       $status = $gags->setStatus($val['Lesson']['status']);
+foreach ($data as $val):
+      
+ $status = $gags->setStatus($val['Lesson']['status']);
        
-       $tr = array (
-        $gags->sendEdit($val['Lesson']['id'], 'lessons'),
-        $html->link($val['Lesson']['title'], '/lessons/display/'.$val['Lesson']['id']),
-        $html->link($status, '/admin/lessons/change/'.$val['Lesson']['id'] .'/'. $val['Lesson']['status']),
-        $gags->confirmDel($val['Lesson']['id'], 'lessons')
-        );
+ $tr = array (
+    $gags->sendEdit($val['Lesson']['id'], 'lessons'),
+    $html->link($val['Lesson']['title'],'/lessons/view/'.$session->read('Auth.User.username').'/'.$val['Lesson']['id']),
+    $html->link($status, '/admin/lessons/change/'.$val['Lesson']['id'] .'/'. $val['Lesson']['status']),
+    $gags->confirmDel($val['Lesson']['id'], 'lessons')
+     );
        
     echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
                                 array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'"));
     
- }
+endforeach;
 ?>
 </table>