Changeset 640

Timestamp:

07/10/08 22:51:44 (3 months ago)

Author:

aarkerio

Message:

Updates genrali

Location:

trunk/app

Files:

• controllers/forums_controller.php (modified) (1 diff)
• controllers/topics_controller.php (modified) (2 diffs)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• models/vclassroom.php (modified) (2 diffs)
• views/elements/lastentries.ctp (modified) (1 diff)
• views/entries/display.ctp (modified) (1 diff)
• views/topics/display.ctp (modified) (3 diffs)

trunk/app/controllers/forums_controller.php

@@ -44 +44 @@
  {      
   // student belongst to this class?
-  if ( $this->Auth->user() && $this->Auth->user('group_id') == 3):
+  if ( $this->Auth->user() ):
              $this->set('belongs', $this->Forum->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
   else:

trunk/app/controllers/topics_controller.php

@@ -25 +25 @@
  public function display($user_id, $forum_id, $topic_id)
  {  
-   $this->pageTitle = 'Discussion';
+  $this->pageTitle = __('Discussion', true);
      
-   $this->layout    = $this->Edublog->layout($user_id);
+  $this->layout    = $this->Edublog->layout($user_id);
      
-   $this->Edublog->blog($user_id);
-     
+  $this->Edublog->blog($user_id);
+   
+  $vclassroom_id = $this->Topic->Forum->field('vclassroom_id', array('Forum.id'=>$forum_id));
+  // student belongst to this class?
+  if ( $this->Auth->user() ):
+             $this->set('belongs', $this->Topic->Forum->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
+  else:
+             $this->set('belongs', false);
+  endif;
+  
    $conditions = array("Topic.status"=>1, "Topic.id"=>$topic_id);
    $fields     = null;
@@ -38 +46 @@
    $this->Topic->Forum->unbindModel(array('hasMany'=>array('Topic')));
    $data =  $this->Topic->find($conditions, $fields, $order, 2);
-   //die(debug($data));
+   
    $this->set('data',$data);
 

trunk/app/controllers/vclassrooms_controller.php

@@ -71 +71 @@
    
    // student belongs to this class?
-   if ( $this->Auth->user() && $this->Auth->user('group_id') == 3):
+   if ( $this->Auth->user()):
              $this->set('belongs', $this->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
    else:

trunk/app/models/vclassroom.php

@@ -20 +20 @@
 
   public $hasMany = array('Forum' =>
-               array('className'     => 'Forum',
+                array('className'     => 'Forum',
                  'conditions'    => null,
                  'order'         => null,
@@ -509 +509 @@
  */
  public function belongs($user_id, $vclassroom_id)
- { 
-   $conditions =  array("UsersVclassroom.user_id"=>$user_id, "UsersVclassroom.vclassroom_id"=>$vclassroom_id);
+ {
+   $conditions =  array('Vclassroom.id'=>$vclassroom_id);
+
+   $teacher_id  =  $this->field('Vclassroom.user_id',$conditions);
+   
+   if ($teacher_id == $user_id ):    // teacher wnats to see his/her own vclass
+          return true;
+   endif;
+
+   $conditions =  array('UsersVclassroom.user_id'=>$user_id, 'UsersVclassroom.vclassroom_id'=>$vclassroom_id);
 
    $data       =  $this->UsersVclassroom->field('UsersVclassroom.user_id',$conditions);

trunk/app/views/elements/lastentries.ctp

@@ -1 +1 @@
 <?php
-echo $html->image('static/blogactiv.gif', array("alt"=>"Teachers Blogging", "title"=>"Teachers Blogging", "style"=>"margin-right:5px 0 10px 0"));
+if ( count($Element['Lentry']) > 0):
+  echo $html->image('static/blogactiv.gif',array("alt"=>"Teachers Blogging", "title"=>"Teachers Blogging", "style"=>"margin-right:5px 0 15px 0"));
+endif;
 
-echo  "<br />";
-
-foreach ($Element["Lentry"] as $key => $val) 
-{
-      echo '<div style="margin-top:3px;padding-left:2px;">' . $html->link($val['Entry']['title'], '/users/entry/'.$val['User']['username'].'/'.$val['Entry']['id']) . " ";
-      echo '<span style="font-size:6pt">'.$val['User']['username'].'</span></div>';
-}
+foreach ($Element['Lentry'] as $val):
+    echo $html->div(null, $html->link($val['Entry']['title'], 
+                          '/entries/view/'.$val['User']['username'].'/'.$val['Entry']['id']) . 
+                           ' <span style="font-size:6pt">'.$val['User']['username'].'</span>', 
+                           aa('style', 'margin-top:4px;padding-left:2px')
+                    );
+endforeach;
 ?>

trunk/app/views/entries/display.ctp

@@ -22 +22 @@
 endforeach;
 
-$paginator->options(array('url' => $val['User']['username']));
+$paginator->options(array('url' => $blog['User']['username']));
 
 $t  = $html->div(null,$paginator->prev('« Previous ',null,null,array('class'=>'disabled')),array('style'=>'width:100px;float:left'));

trunk/app/views/topics/display.ctp

@@ -12 +12 @@
 echo $html->para(null, '<b>Discussion topic:</b> '.$data['Topic']['message']);
 
-if ( $session->check('Auth.User') ):
+if ( $belongs === true ):
 /*
  $tmp = $html->link(  // add topic
@@ -49 +49 @@
  $int = 1;
 
- foreach ($data['Reply'] as $val) 
- {
+  foreach ($data['Reply'] as $val):
     $i = $int++;
         $tmp   = '<b>'.  $i . '.-</b> '; 
@@ -60 +59 @@
     echo $html->div('reply', $tmp);
     
- }
+  endforeach;
 echo '</div>';