Changeset 637 for trunk/app/controllers/entries_controller.php

Timestamp:

07/10/08 17:53:04 (5 months ago)

Author:

aarkerio

Message:

Litle changes

Files:

• trunk/app/controllers/entries_controller.php (modified) (7 diffs)

trunk/app/controllers/entries_controller.php

@@ -11 +11 @@
 
 uses('sanitize');
-uses('l10n');
+
 
 class EntriesController extends AppController {
@@ -126 +126 @@
     $this->Entry->create();
       
-        if ($this->Entry->save($this->data["Entry"])): 
+        if ($this->Entry->save($this->data)): 
            if ( $this->data["Entry"]["end"] == 1 ):     // edition ends
-                     $this->msgFlash('Story has been added', '/admin/entries/listing');
+                     $this->msgFlash(__('Entry saved', true), '/admin/entries/listing');
    
            else:           //edition continue
                      $id = $this->Entry->getLastInsertID();
-                     $this->msgFlash('Story has been added', '/admin/entries/edit/'.$id);
+                     $this->msgFlash(__('Entry saved', true), '/admin/entries/edit/'.$id);
            endif;
         endif;
@@ -149 +149 @@
     $this->layout = 'admin';      
 
-    $conditions = array("Entry.user_id"=>$this->Auth->user('id'));
-       
-    $fields     = null;
-
-    $order      = 'Entry.id DESC';
-       
-    $limit      = 20;
-       
-    $this->set('data', $this->Entry->findAll($conditions, $fields, $order, $limit));
+    $this->paginate['limit'] = 10;
+
+    $this->paginate['fields'] = array('Entry.title', 'Entry.body', 'Entry.created', 'Entry.status', 'Entry.user_id', 'Entry.discution', 'Entry.subject_id', 'Entry.id', 'User.username', 'Subject.title', 'Subject.id');
+ 
+    $this->paginate['conditions'] = array("Entry.user_id"=>$this->Auth->user('id'));    
+     
+    $data = $this->paginate('Entry');
+     
+    $this->set(compact('data'));
+  
  }
   
@@ -166 +167 @@
    $this->set('subjects',Set::combine($this->Entry->Subject->find('all',array('order'=>'title')),"{n}.Subject.id","{n}.Subject.title"));
      
-     if (empty($this->data['Entry']))
-     {
-         $this->data = $this->Entry->read(null, $id);
-     }
-     else
-     { 
+   if (empty($this->data['Entry'])):
+         $this->data = $this->Entry->read(null, $id);  
+   else:
          $this->Sanitize = new Sanitize;
       
@@ -182 +180 @@
                      $this->redirect('/admin/entries/listing');
              else:
-                     $this->msgFlash('Entry has been updated','/admin/entries/edit/'.$this->data['Entry']['id']);
+                     $this->msgFlash(__('Entry saved', true),'/admin/entries/edit/'.$this->data['Entry']['id']);
          endif;
      endif;
-     }
+     endif;
   }
  // change status enabled/disabled actived
@@ -195 +193 @@
      
     if ($this->Entry->save($this->data['Entry'])):
-    $this->msgFlash('Entry status changed', '/admin/entries/listing');
+    $this->msgFlash(__('Status modified', true), '/admin/entries/listing');
     endif;
  }
@@ -210 +208 @@
  {
    if ( $this->Entry->del($id)):
-             $this->msgFlash('The entry has been deleted.', '/admin/entries/listing');
+             $this->msgFlash(__('Data deleted',true), '/admin/entries/listing');
    endif;
   }