Changeset 407

Timestamp:

04/16/08 17:24:40 (9 months ago)

Author:

aarkerio

Message:

Updates on polls

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• config/core.php (modified) (1 diff)
• config/routes.php (modified) (1 diff)
• controllers/discussions_controller.php (modified) (1 diff)
• controllers/polls_controller.php (modified) (3 diffs)
• models/discussion.php (modified) (1 diff)
• models/discution.php (deleted)
• models/news.php (modified) (1 diff)
• views/errors/error404.ctp (modified) (1 diff)
• views/news/admin_listing.ctp (modified) (1 diff)
• views/news/view.ctp (modified) (2 diffs)
• views/polls/admin_add.ctp (modified) (2 diffs)

trunk/app/app_controller.php

@@ -12 +12 @@
 class AppController extends Controller {
  
- public $components = array('Auth', 'Cookie', 'Security', 'Session');
+ public $components = array('Auth', 'Cookie', 'Session', 'Security');
  
  public $helpers    = array('Html', 'Form', 'Session');

trunk/app/config/core.php

@@ -14 +14 @@
  * In development mode, you need to click the flash message to continue.
  */
-    Configure::write('debug', 2);
+    Configure::write('debug', 1);
 /**
  * Application wide charset encoding

trunk/app/config/routes.php

@@ -14 +14 @@
  * developement.
  */
-    Router::connect('/tests', array('controller' => 'tests', 'action' => 'index'));
+// Router::connect('/tests', array('controller' => 'tests', 'action' => 'index'));
 ?>

trunk/app/controllers/discussions_controller.php

@@ -42 +42 @@
  public function agregar()
  {
+ 
   $this->layout = 'portal';
-   
-  echo 'I am in add function !!!<br />';
+  
+  echo 'I am in agregar function !!!<br />';
 
   die(debug($this->data));

trunk/app/controllers/polls_controller.php

@@ -25 +25 @@
  }
                                                                   
-/**
-== ADMIN METHODS
-**/
+/**== ADMIN METHODS **/
 
-public function admin_add() 
-{
+ public function admin_listing()
+ {
       $this->layout    = 'admin';
-      $this->pageTitle = 'Add Poll';
+      $this->pageTitle = 'Polls';
       
-     if (!empty($this->data["Poll"]))
-     {
-         $this->Sanitize = new Sanitize;
+      $conditions      = array("user_id" => $this->Auth->user('id'));
+      $fields          = array("id", "question", "created", "status");
+      $order           = "created DESC";
+      
+      $this->set('data', $this->Poll->findAll($conditions, $fields, $order, null, null, 2));
+ }
+ 
+ public function admin_add() 
+ {
+  $this->layout    = 'admin';
+  $this->pageTitle = 'Add Poll';
+      
+  if (!empty($this->data['Poll']))
+  {
+    $this->Sanitize = new Sanitize;
          
-         $this->Sanitize->clean($this->data['Poll']); //Hopefully this is enough
+    $this->Sanitize->clean($this->data['Poll']); //Hopefully this is enough
          
-         $this->Pollrow = new Pollrow;
+    $this->Pollrow = new Pollrow;
          
-         $this->data['Poll']['user_id'] = $this->Auth->user('id');
+    $this->data['Poll']['user_id'] = $this->Auth->user('id');
      
      $this->Poll->create();
          
-         if ( $this->Poll->save($this->data['Poll']))
-         {   
-                $this->Poll->id    = false;
-                $this->Pollrow->id = false;
+    if ( $this->Poll->save($this->data['Poll']))
+    {   
+        $this->Poll->id    = false;
+        $this->Pollrow->id = false;
                 
-                $poll_id = $this->Poll->getLastInsertID();
+        $poll_id = $this->Poll->getLastInsertID();
                 
-                $colors = array('green', 'blue', 'brown', 'yellow', 'orange', 'red', 'black');
+        $colors = array('green', 'blue', 'brown', 'yellow', 'orange', 'red', 'black');
                 
                 $i = 0;
@@ -69 +79 @@
                 }
             
-            exit($this->redirect('/admin/polls/listing'));
+            $this->msgFlash('Poll saved', '/admin/polls/listing');
             
-            } 
-            else
-            {
-                  $this->flash('/admin/polls/listing', 'Error Pollrow model');
-            } 
-       }
-  }
+     } 
+     else
+     {
+            $this->flash('/admin/polls/listing', 'Error Pollrow model');
+     } 
+   }
+ }
  
- public function admin_listing()
-   {
-      $this->layout    = 'admin';
-      $this->pageTitle = 'Polls';
-      
-      $conditions      = array("user_id" => $this->othAuth->user('id'));
-      $fields          = array("id", "question", "created", "status");
-      $order           = "created DESC";
-      
-      $this->set('data', $this->Poll->findAll($conditions, $fields, $order, null, null, 2));
-   }
-   
-public function admin_edit($id=null)
-{
+ public function admin_edit($poll_id=null)
+ {
     
     if (empty($this->data['Poll']))
     {
         $this->layout = 'admin';
-        
-        $this->Poll->id = $id;
               
-        $this->data = $this->Poll->read();
+        $this->data = $this->Poll->read(null, $poll_id);
     }
     else
@@ -114 +110 @@
         }
     }
-}
-
-  public function admin_delete($id)
-  {
-        // deletes task from database
-                //die($this->data['Poll']['id']);
-        $this->Poll->del($id);
-        $this->msgFlash('Poll deleted', '/admin/polls/listing');
-     exit();
+ }
+ 
+ public function admin_delete($id)
+ {
+        if ( $this->Poll->del($id) )
+        {
+           $this->msgFlash('Poll deleted', '/admin/polls/listing');
+        }
   }
 }

trunk/app/models/discussion.php

@@ -24 +24 @@
 
   public $validate = array(
-                      'username' => array(
-                     'rule' => array('minLength', 2),  
+                      'comment' => array(
+                           'rule' => array('minLength', 2),  
                                           'message' => 'Usernames must be at least 6 characters long.'
                      ) 

trunk/app/models/news.php

@@ -33 +33 @@
      public $validate = array(
            'title' => VALID_NOT_EMPTY,
-       'user_id' => VALID_NOT_EMPTY,
+            'user_id' => VALID_NOT_EMPTY,
            'body' => VALID_NOT_EMPTY,
-       'status' => VALID_NOT_EMPTY
+            'status' => VALID_NOT_EMPTY
      );
  

trunk/app/views/errors/error404.ctp

@@ -1 @@
-Karamelo: error404.thtml
+<h1><?php echo $name;   ?></h1>
+<p><?php echo $message; ?></p>
+

trunk/app/views/news/admin_listing.ctp

@@ -4 +4 @@
   <?php 
      echo $html->link($html->image('actions/new.png', array("alt"=>"Add new", "title"=>"Add new")), '/admin/news/add', null, false, false);
-     echo $html->link($html->image('static/forum.gif', array("alt"=>"See comments", "title"=>"See comments")), '/admin/commentnews/listing', null, false, false);
+     echo $html->link($html->image('static/forum.gif', array("alt"=>"See comments", "title"=>"See comments")), '/admin/discussions/listing', null, false, false);
   ?>
 

trunk/app/views/news/view.ctp

@@ -46 +46 @@
               
       echo '<div class="comentnew" style="background-color:'.$bg.'">';  
-      echo $time->timeAgoInWords($v["created"]) . " <b>". $v["name"]    . "</b> wrote:<br />";
+      echo $time->timeAgoInWords($v['created']) . ' <b>'. $v['name']    . '</b> wrote:<br />';
       echo $v["comment"];
       echo "</div>";
@@ -54 +54 @@
 
   echo $form->create('Discussion', array('action'=>'agregar'));
+  //echo '<form action="/discussions/agregar" method="post">';
 ?>
+
+
 <fieldset>
    <legend>Write comment:</legend>

trunk/app/views/polls/admin_add.ctp

@@ -1 +1 @@
 
-<?php echo $html->formTag('/admin/polls/add/','post'); ?>
+<?php echo $form->create('Poll'); ?>
 <fieldset>
 <legend>New Poll</legend>
-  <?php echo $form->labelTag('Poll/question', 'Question:') . "<br />"; ?>
-  <?php echo $html->input('Poll/question', array("size" => 60, "maxlength"=>130)); ?>
-  <?php echo $html->tagErrorMsg('Poll/question', 'A question is required.'); ?>
+  <?php 
+    echo $form->input('Poll.question', array("size" => 60, "maxlength"=>100));
+  ?>
+  
   <div style="margin:15px auto 15px auto;border:1px dotted gray;padding-left:40px;width:80%;">
 
 <?php 
 for ($i=1;$i<10;$i++) 
-{
-   echo $form->labelTag('Row/answer'.$i, 'Answer ' . $i . ':') . "<br />"; 
-   echo $html->input('Row/answer'.$i, array("size" => 50, "maxlenght"=>100));  
+{ 
+  echo $form->input('Row.answer'.$i, array('size' => 50, 'maxlenght'=>100));  
 }
 ?>
@@ -18 +18 @@
 
 <?php 
-  echo $form->labelTag('Poll/status', 'Published:') . "<br />"; 
-  echo $html->checkbox('Poll/status'); 
+  echo $form->label('Poll.status', 'Published:') . "<br />"; 
+  echo $form->checkbox('Poll.status', array('value'=>1)); 
 ?>
 
-<div style="clear:both"></div>
-<?php echo $html->submit('Add'); ?>
-</fieldset>
-</form>
+<div style="clear:both"></div></fieldset>
 
+<?php echo $form->end('Save'); ?>
+
+