Changeset 675 for trunk/app/controllers

Timestamp:

07/24/08 16:00:36 (4 months ago)

Author:

aarkerio

Message:

Update testt

Location:

trunk/app/controllers

Files:

• entries_controller.php (modified) (2 diffs)
• tests_controller.php (modified) (7 diffs)

trunk/app/controllers/entries_controller.php

@@ -150 +150 @@
  }
  
- public function admin_start($order = null)
+ public function admin_start()
  {
      $this->layout = 'admin';
@@ -157 +157 @@
  }
   
- public function admin_listing($page=1) 
+ public function admin_listing() 
  { 
     $this->layout = 'admin';      

trunk/app/controllers/tests_controller.php

@@ -8 +8 @@
 
 uses('Sanitize');
-uses('L10n');
 
 class TestsController extends AppController
@@ -55 +54 @@
    
     // student belongst to this class?
-    if ( $this->Auth->user() && $this->Auth->user('group_id') == 3):
+    if ( $this->Auth->user() ):
       $this->set('belongs', $this->Test->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
     else:
@@ -210 +209 @@
       
       if ( $this->Test->TestsVclassroom->save($this->data['TestsVclassroom'])):
-               $this->msgFlash('Test assigned', '/admin/tests/vclassrooms/'.$this->data['TestsVclassroom']['test_id']);
+               $this->msgFlash(__('Test assigned', true), '/admin/tests/vclassrooms/'.$this->data['TestsVclassroom']['test_id']);
       else: 
               die('Something is wrong, please report this bug');
@@ -227 +226 @@
                  
       if ( $this->Test->TestsVclassroom->delete($this->data['TestsVclassroom']['id'])):
-               $this->msgFlash('Test unlinked', '/admin/tests/vclassrooms/'.$this->data['TestsVclassroom']['test_id']);
+               $this->msgFlash(__('Resource unlinked', true), '/admin/tests/vclassrooms/'.$this->data['TestsVclassroom']['test_id']);
       else:
               die('Something is wrong, please report this bug');
@@ -247 +246 @@
       $this->Test->create(); 
       //var_dump($this->data['Test']);
-      if ( $this->Test->save($this->data["Test"])):
-               $this->msgFlash('Test saved', '/admin/tests/listing');
+      if ( $this->Test->save($this->data)):
+               $this->msgFlash(__('Data saved', true), '/admin/tests/listing');
       else: 
               die('Something is wrong, please report this bug');
@@ -267 +266 @@
            
        if ( $this->Test->save($this->data["Test"])):
-               $this->msgFlash('Test saved', '/admin/tests/listing');
+               $this->msgFlash(__('Data saved', true), '/admin/tests/listing');
            endif;   
       else:
@@ -289 +288 @@
    $this->data['Test']['id']     = $id;
      
-   if ($this->Test->save($this->data['Test'])):
-         $this->msgFlash('Test status changed', '/admin/tests/listing');
+   if ($this->Test->save($this->data)):
+         $this->msgFlash(__('Status modified', true), '/admin/tests/listing');
    endif;
  }