Changeset 730 for trunk/app/controllers

Show
Ignore:
Timestamp:
08/20/08 20:54:59 (3 months ago)
Author:
aarkerio
Message:

Bugs fixed

Location:
trunk/app/controllers
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/app/controllers/answers_controller.php

    r696 r730  
    4949   $this->layout = 'admin'; 
    5050 
    51    if (empty($this->data["Answer"])): 
     51   if (empty($this->data['Answer'])): 
    5252        $this->data = $this->Answer->read(null, $answer_id ); 
    5353   else: 
    … …  
    5656         
    5757       $this->Sanitize->clean($this->data['Answer']);  
    58          
     58        
    5959       if ($this->Answer->save($this->data)): 
    60           $this->msgFlash(__('Answer updated', true),'/admin/questions/answers/'.$this->data['Answer']['question_id']); 
     60          $this->msgFlash(__('Data saved', true),'/admin/questions/answers/'.$this->data['Answer']['question_id']); 
    6161       endif; 
    6262 endif;   
    … …  
    6565 public function admin_listing($question_id) 
    6666 { 
    67      $this->layout    = 'ajax'; 
     67     $this->layout = 'ajax'; 
    6868         
    69      $conditions = array("Answer.user_id"=>$this->Auth->user('id'), "Answer.question_id"=>$question_id); 
     69     $conditions   = array('Answer.user_id'=>$this->Auth->user('id'), 'Answer.question_id'=>$question_id); 
    7070         
    71      $fields     = array("Answer.id", "Answer.user_id", "Answer.correct"); 
     71     $fields       = array('Answer.id', 'Answer.user_id', 'Answer.correct'); 
    7272         
    73      $order = "Answer.id DESC"; 
     73     $order        = 'Answer.id DESC'; 
    7474         
    7575     $this->set('data', $this->Answer->findAll($conditions, $fields, $order)); 
    … …  
    8080  public function admin_questions($test_id) 
    8181  { 
    82         $this->pageTitle = 'Answers'; 
     82     $this->pageTitle = __('Answers', true); 
    8383         
    84         $conditions = array("Answer.user_id"=>$this->Auth->user('id'), "Answer.id"=>$test_id); 
     84     $conditions = array('Answer.user_id'=>$this->Auth->user('id'), 'Answer.id'=>$test_id); 
    8585         
    86         $fields     = array("Answer.id", "Answer.user_id", "Answer.title", "Answer.description"); 
     86     $fields     = array("Answer.id", "Answer.user_id", "Answer.title", "Answer.description"); 
    8787         
    88         $order = "Answer.id DESC"; 
     88     $order    = 'Answer.id DESC'; 
    8989         
    90         $this->set('data', $this->Answer->findAll($conditions, $fields, $order)); 
     90     $this->set('data', $this->Answer->findAll($conditions, $fields, $order)); 
    9191  } 
    9292 

  • trunk/app/controllers/vclassrooms_controller.php

    r729 r730  
    115115            $this->set('msg', __('You are already member of this class', true)); 
    116116            $this->render('jointoclass', 'ajax'); 
    117      else: 
     117    else: 
    118118            $this->data['UsersVclassroom']['user_id'] = $this->Auth->user('id'); 
    119119