Changeset 342 for trunk/app/controllers/ecourses_controller.php

Timestamp:

03/25/08 01:03:27 (8 months ago)

Author:

aarkerio

Message:

eCourses fixes

Files:

• trunk/app/controllers/ecourses_controller.php (modified) (5 diffs)

trunk/app/controllers/ecourses_controller.php

@@ -36 +36 @@
        $this->layout = 'admin';
        
-            
        $conditions   =  array("user_id"=>$this->Auth->user('id'));
        $fields       =  array('id', 'title', 'access',  'status', 'description');
        $order        =  "Ecourse.title DESC";
-            
+       
        $this->set('data', $this->Ecourse->findAll($conditions, $fields, $order));
   }
@@ -67 +66 @@
         $this->set('data', $this->Ecourse->find($conditions, $fields));
   }
- 
-  public function admin_add() 
-  {   
-    $this->layout    = 'admin'; 
-    
-    if (!empty($this->data['Ecourse']))
-    {
-        $this->Sanitize = new Sanitize;
-        
-        $this->Sanitize->clean($this->data["Ecourse"]);
-  
-        $this->data['Ecourse']['user_id'] = $this->Auth->user('id');
-
-        $this->Ecourse->create();
-   
-        if ($this->Ecourse->save($this->data['Ecourse']))
-        {
-                $this->msgFlash('Course saved', '/admin/ecourses/listing');
-        }
-    }
-    else
-    {
- 
-     $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
-
-     $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
-
-    }
-  }
   
   public function admin_change($id, $status)
@@ -112 +82 @@
         }
     }
+  public function admin_add() 
+  {   
+    $this->layout    = 'admin'; 
+    
+    $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+    
+    $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
+    
+    if (!empty($this->data['Ecourse']))
+    {
+        $this->Sanitize = new Sanitize;
+        
+        $this->Sanitize->clean($this->data["Ecourse"]);
+        
+        $this->data['Ecourse']['user_id'] = $this->Auth->user('id');
+        
+        $this->Ecourse->create();
+        
+        if ($this->Ecourse->save($this->data['Ecourse']))
+        {
+                $this->msgFlash('Course saved', '/admin/ecourses/listing');
+        }
+    }
+  }
   
   public function admin_edit($id = null)
   {
-     
-    if (empty($this->data['Ecourse']))
+    $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+    
+    $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
+    
+    if ( empty($this->data['Ecourse']) )
     {
         $this->layout = 'admin';
@@ -124 +121 @@
         $this->Subject     = new Subject;
         
-        $this->set('subjects', $this->Ecourse->Subject->generateList(null, 'title'));       
-    
-        $this->set('langs', $this->Ecourse->Lang->generateList(null, 'lang', null, '{n}.Lang.id', '{n}.Lang.lang'));
-        
         $this->data = $this->Ecourse->read();
+        
     }
     else
@@ -135 +129 @@
         
         $this->Sanitize->html($this->data["Ecourse"]['description']);
-
+        
         if ($this->Ecourse->save($this->data['Ecourse']))
         {