Changeset 660 for trunk/app/controllers

Timestamp:

07/21/08 18:29:34 (4 months ago)

Author:

aarkerio

Message:

Update general

Location:

trunk/app/controllers

Files:

• shares_controller.php (modified) (1 diff)
• subjects_controller.php (modified) (2 diffs)

trunk/app/controllers/shares_controller.php

@@ -51 +51 @@
     }
 
-  /**
-   === ADMIN METHOD ===
-  **/
+ /**   === ADMIN METHOD ===  **/
  public function admin_listing()
  {   
-        $this->pageTitle = $this->Auth->user('username') . '\'s Shares';
-        
-        $this->layout = 'admin';
-        
-        $conditions   = array("Share.user_id"=>$this->Auth->user('id'));
-        $fields       = array("id", "file", "description", "created", "secret", "public");
-        $order        = "Share.id DESC";
-        $limit        = 20;
-        
-        $this->set('data', $this->Share->findAll($conditions, $fields, $order, $limit)); 
+   $this->pageTitle = $this->Auth->user('username') . '\'s Shares';
+
+   $this->set('subjects',Set::combine($this->Share->Subject->find('all',array('order'=>'title')),"{n}.Subject.id","{n}.Subject.title"));
+        
+   $this->layout = 'admin';
+        
+   $conditions   = array("Share.user_id"=>$this->Auth->user('id'));
+   $fields       = array("id", "file", "description", "created", "secret", "public");
+   $order        = "Share.id DESC";
+   $limit        = 20;
+        
+   $this->set('data', $this->Share->findAll($conditions, $fields, $order, $limit)); 
  }
     

trunk/app/controllers/subjects_controller.php

@@ -3 +3 @@
 *  Karamelo E-Learning Platform
 *  Manuel Montoya 2002-2008
-*  GPLv3 manuel<at>mononeurona<punto>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
  
@@ -40 +40 @@
  public function view($code)
  {  
-      $this->layout    = 'portal';
-     
-      $this->title     = 'Subject';
+   $this->layout    = 'portal';
       
-      $conditions = array("Subject.code"=>$code);
+   $this->Portal->statics(); // Charge Portal components aka Sidebars
+
+   $this->title     = __('Subject', true);
       
-      $this->set('data', $this->Subject->find($conditions, null, null, 2));
-      
-      $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
+   $conditions = array('Subject.code'=>$code);
+   
+   $this->set('data', $this->Subject->find($conditions));
  }
    
- public function show($subject_id)
- {   
-        $this->pageTitle = 'Karamelo :: Subject';
-        $this->layout    = 'default'; //$this->Blog->field;
-        $conditions      = array("Subject.id"=>$subject_id);
-        $fields          = array("Subject.id", "Subject.title", "Subject.code");
-        $order           = "Subject.title DESC";
-        
-        $this->set('subjects', $this->Portal->cms()); // Using Portal component
-        
-        $this->set('randomQuote', $this->Portal->quote()); // quote footer
-        
-        $this->set('data', $this->Subject->findAll($conditions, $fields, $order));
-  }
    
   /** ==== ADMIN METHODS ==== */