Changeset 782

Show
Ignore:
Timestamp:
09/26/08 23:01:59 (8 weeks ago)
Author:
aarkerio
Message:

Test Unit fixed

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/app/controllers/answers_controller.php

    r774 r782  
    2929     $this->Sanitize = new Sanitize; 
    3030         
    31      $this->Sanitize->clean($this->data["Answer"]); 
     31     $this->Sanitize->clean($this->data['Answer']); 
    3232         
    33      $this->data["Answer"]['user_id'] = $this->Auth->user('id'); 
     33     $this->data['Answer']['user_id'] = $this->Auth->user('id'); 
    3434         
    3535     if ( $this->Answer->save($this->data) ): 
    36          $conditions = array("Answer.question_id" => $this->data['Answer']['question_id']); 
    37          $fields     = array("Answer.id", "Answer.answer", "Answer.correct", "Answer.question_id"); 
    38          $order      = "Answer.id";            
     36         $conditions = array('Answer.question_id' => $this->data['Answer']['question_id']); 
     37         $fields     = array('Answer.id', 'Answer.answer', 'Answer.correct', 'Answer.question_id'); 
     38         $order      = 'Answer.id';            
    3939         $this->set('data', $this->Answer->findAll($conditions, $fields, $order)); 
    4040         $this->render('questions', 'ajax'); 
    41    else: 
    42      echo "Ajax error, check with the company's computer guy..."; 
    4341   endif; 
    4442  endif; 
    … …  
    5250        $this->data = $this->Answer->read(null, $answer_id ); 
    5351   else: 
    54  
    5552       $this->Sanitize = new Sanitize; 
    56          
    5753       $this->Sanitize->clean($this->data['Answer']);  
    58         
    5954       if ($this->Answer->save($this->data)): 
    6055          $this->msgFlash(__('Data saved', true),'/admin/questions/answers/'.$this->data['Answer']['question_id']); 
    … …  
    6560 public function admin_listing($question_id) 
    6661 { 
    67      $this->layout = 'ajax'; 
    68          
    69      $conditions   = array('Answer.user_id'=>$this->Auth->user('id'), 'Answer.question_id'=>$question_id); 
    70          
    71      $fields       = array('Answer.id', 'Answer.user_id', 'Answer.correct'); 
    72          
    73      $order        = 'Answer.id DESC'; 
    74          
    75      $this->set('data', $this->Answer->findAll($conditions, $fields, $order)); 
    76          
    77      $this->render('answers', 'ajax'); 
     62   $this->layout = 'ajax'; 
     63   $conditions   = array('Answer.user_id'=>$this->Auth->user('id'), 'Answer.question_id'=>$question_id); 
     64   $fields       = array('Answer.id', 'Answer.user_id', 'Answer.correct'); 
     65   $order        = 'Answer.id DESC'; 
     66   $this->set('data', $this->Answer->findAll($conditions, $fields, $order)); 
     67   $this->render('answers', 'ajax'); 
    7868  } 
    7969   
    … …  
    8171  { 
    8272     $this->pageTitle = __('Answers', true); 
    83          
    8473     $conditions = array('Answer.user_id'=>$this->Auth->user('id'), 'Answer.id'=>$test_id); 
    8574     $fields     = array('Answer.id', 'Answer.user_id', 'Answer.title', 'Answer.description'); 
    86      $order      = 'Answer.id DESC' 
     75     $order      = 'Answer.id DESC'; 
    8776     $this->set('data', $this->Answer->findAll($conditions, $fields, $order)); 
    8877  } 
    … …  
    10392    // deletes from datab 
    10493    if ( $this->Answer->del($answer_id) ): 
    105             $this->msgFlash(__('Answer deleted', true), '/admin/questions/answers/'.$question_id); 
     94            $this->msgFlash(__('Data removed', true), '/admin/questions/answers/'.$question_id); 
    10695    endif; 
    10796  }