Changeset 291

Timestamp:

02/29/08 13:57:50 (10 months ago)

Author:

aarkerio

Message:

Fixed poll and admin routes

Location:

trunk/app

Files:

• controllers/entries_controller.php (modified) (2 diffs)
• controllers/pollrows_controller.php (modified) (1 diff)
• models/pollrow.php (modified) (1 diff)
• views/elements/poll.ctp (modified) (3 diffs)
• views/pollrows/results.ctp (modified) (2 diffs)

trunk/app/controllers/entries_controller.php

@@ -12 +12 @@
  public $helpers       = array('Ajax', 'Fck', 'Gags');
  
-  //public $components    = array('Edublog', 'Portal', 'Search', 'Mypagination');
-  public function isAuthorized() 
-  {
-    if ($this->action == 'admin_listing') 
+ public $components    = array('Edublog', 'Portal');
+
+ public function isAuthorized() 
+ {      
+    if (isset( $this->params[Configure::read('Routing.admin')] )) 
     {
     if ($this->Auth->user('group_id') == 1) 
@@ -21 +22 @@
         return true;
         } 
-    else 
-        {
-        return false;
-        }
-    }
- 
-    return true;
+    } 
+    return false;  // go away !!
  }
 

trunk/app/controllers/pollrows_controller.php

@@ -41 +41 @@
            $this->Session->write('poll',  $this->data['Pollrow']['poll_id']); //set session, only one vote per session
                     
-           $conditions = array("Pollrow.poll_id" => $this->data['Pollrow']['poll_id']);
+           $conditions = array("Poll.id" => $this->data['Pollrow']['poll_id']);
 
-           $fields     = array("Pollrow.answer", "Pollrow.color", "Pollrow.vote", "Pollrow.poll_id", "Poll.id", "Poll.question");
-                    
-           $this->set('poll', $this->Pollrow->find($conditions, $fields));
+           $this->set('poll', $this->Pollrow->Poll->find($conditions));
                     
            $this->render('results', 'ajax');

trunk/app/models/pollrow.php

@@ -11 +11 @@
   public $name      = 'Pollrow';
   
-  /* public $belongsTo = array('Poll' =>
+ public $belongsTo = array('Poll' =>
                 array(
                                   'className'  => 'Poll', 
                                   'foreignKey' => 'poll_id'
                            )
-                     ); */
+                     );
 }
 ?>

trunk/app/views/elements/poll.ctp

@@ -7 +7 @@
 <div id="add_pollrow">
 
-  <?php
+ <?php
   $poll = $session->read('poll');
   
-  if ( $poll != null &&  $Element["Poll"]['Poll']['id'] == $poll) // the user has not voted
+  if ( $poll != null &&  $Element["Poll"]['Poll']['id'] == $poll) // the user has already voted, show poll results
   {
-        
     $total_votes = 0;
     
@@ -40 +39 @@
     echo '<p class="negrita">Total votes:' . $total_votes . '</p>'; 
   }
-  else // the user has voted, just print the poll result
+  else // the user has no voted, print the form
   {
     echo $ajax->form();
@@ -48 +47 @@
     echo "<p><b>" . $Element["Poll"]['Poll']['question'] ."</b></p>";
     
-    echo $form->hidden('Pollrow.poll_id', $Element["Poll"]['Poll']['id']);  // Poll_id
+    echo $form->hidden('Pollrow.poll_id', array("value"=>$Element["Poll"]['Poll']['id']));  // Poll_id
     
     foreach ($Element["Poll"]['Pollrow'] as $key=>$val)

trunk/app/views/pollrows/results.ctp

@@ -1 +1 @@
 <?php
-  //exit(print_r( $poll ));
+/**  GPLV3 Chipotle Software  2002-2008 **/
+//exit(print_r( $poll ));  
   $total_votes = 0;
   
-  foreach ($poll as $val) 
+  foreach ( $poll['Pollrow'] as $val ) 
   {
-       $total_votes += $val["Pollrow"]["vote"];  // the total votes
+       $total_votes += $val["vote"];  // the total votes
   }
   
-  echo "<p><b>" . $poll[0]['Poll']['question'] ."</b></p>";
+  echo "<p><b>" . $poll['Poll']['question'] ."</b></p>";
   
-  foreach ($poll as $val) 
+  foreach ($poll['Pollrow'] as $val) 
   {          
-             if ($val["Pollrow"]["vote"] > 0 )
+             if ($val["vote"] > 0 )
              {
-                   $percent = ($val["Pollrow"]["vote"] * 100) / $total_votes;  // % = votes * 100 / total
+                   $percent = ($val["vote"] * 100) / $total_votes;  // % = votes * 100 / total
              }
              else
@@ -23 +24 @@
              $width   = number_format($percent, 0);
              
-             echo '<p><b>' . $val["Pollrow"]["answer"] . '</b> '.number_format($percent, 2).'% <br />' . "\n"; 
-             echo $html->image('static/poll/'.$val["Pollrow"]["color"].'.png', 
-             array("height"=>"10", "width"=>$width,"alt"=>$val["Pollrow"]["answer"], "title"=>$val["Pollrow"]["answer"])) . "\n";
-             echo "  ". $val["Pollrow"]['vote'] . "\n";
+             echo '<p><b>' . $val["answer"] . '</b> '.number_format($percent, 2).'% <br />' . "\n"; 
+             echo $html->image('static/poll/'.$val["color"].'.png', 
+             array("height"=>"10", "width"=>$width,"alt"=>$val["answer"], "title"=>$val["answer"])) . "\n";
+             echo "  ". $val['vote'] . "\n";
   }