From e1052278ef479a7fa4fd502abe5f0069449dbb01 Mon Sep 17 00:00:00 2001
From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Sat, 26 May 2012 19:39:35 +0200
Subject: [PATCH] Navegation ads index: parameter page.

---
 apps/companyfront/modules/ad/actions/actions.class.php  |  7 +++++++
 apps/companyfront/modules/ad/templates/_form.php        |  4 ++--
 apps/companyfront/modules/ad/templates/editSuccess.php  |  2 +-
 apps/companyfront/modules/ad/templates/indexSuccess.php | 13 +++++++++++--
 apps/companyfront/modules/ad/templates/newSuccess.php   |  2 +-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/companyfront/modules/ad/actions/actions.class.php b/apps/companyfront/modules/ad/actions/actions.class.php
index 4c70479..9919373 100644
--- a/apps/companyfront/modules/ad/actions/actions.class.php
+++ b/apps/companyfront/modules/ad/actions/actions.class.php
@@ -67,6 +67,7 @@ class adActions extends sfActions
     $userId = $this->getUser()->getGuardUser()->getId();
 
     $this->form = new AdForm(null, array('company_user_id' => CompanyTable::getInstance()->findOneByUserId($userId)->getId()));
+    $this->page = $request->getParameter('page', 1);
   }
 
   public function executeCreate(sfWebRequest $request)
@@ -83,6 +84,8 @@ class adActions extends sfActions
 
     $this->form = new AdForm($adInit, array('company_user_id' => $companyUserId));
 
+    $this->page = $request->getParameter('page', 1);
+
     $this->processForm($request, $this->form);
 
     $this->setTemplate('new');
@@ -105,6 +108,8 @@ class adActions extends sfActions
 
     $this->forward404Unless($companyId == $companyUserId, sprintf('Ad does not exist (%s).', $request->getParameter('id')));
 
+    $this->page = $request->getParameter('page', 1);
+
     $this->form = new AdForm($ad, array('company_user_id' => $companyUserId));
   }
 
@@ -128,6 +133,8 @@ class adActions extends sfActions
 
     $this->form = new AdForm($ad, array('company_user_id' => $companyUserId));
 
+    $this->page = $request->getParameter('page', 1);
+
     $this->processForm($request, $this->form);
 
     $this->setTemplate('edit');
diff --git a/apps/companyfront/modules/ad/templates/_form.php b/apps/companyfront/modules/ad/templates/_form.php
index 66bba95..6ef22b0 100644
--- a/apps/companyfront/modules/ad/templates/_form.php
+++ b/apps/companyfront/modules/ad/templates/_form.php
@@ -1,7 +1,7 @@
 <?php use_stylesheets_for_form($form) ?>
 <?php use_javascripts_for_form($form) ?>
 
-<form action="<?php echo url_for('ad/'.($form->getObject()->isNew() ? 'create' : 'update').(!$form->getObject()->isNew() ? '?id='.$form->getObject()->getId() : '')) ?>" method="post" <?php $form->isMultipart() and print 'enctype="multipart/form-data" ' ?>>
+<form action="<?php echo url_for('ad/'.($form->getObject()->isNew() ? 'create' : 'update').'?page='.$page.(!$form->getObject()->isNew() ? '&id='.$form->getObject()->getId() : '')) ?>" method="post" <?php $form->isMultipart() and print 'enctype="multipart/form-data" ' ?>>
 <?php if (!$form->getObject()->isNew()): ?>
 <input type="hidden" name="sf_method" value="put" />
 <?php endif; ?>
@@ -10,7 +10,7 @@
       <tr>
         <td colspan="2">
           <?php echo $form->renderHiddenFields(false) ?>
-          &nbsp;<a href="<?php echo url_for('ad/index') ?>">Back to list</a>
+          &nbsp;<a href="<?php echo url_for('ad/index?page='.$page) ?>"><?php echo __('Back to list') ?></a>
           <input type="submit" value="Update" />
         </td>
       </tr>
diff --git a/apps/companyfront/modules/ad/templates/editSuccess.php b/apps/companyfront/modules/ad/templates/editSuccess.php
index 0cdbaf0..4ccd9da 100644
--- a/apps/companyfront/modules/ad/templates/editSuccess.php
+++ b/apps/companyfront/modules/ad/templates/editSuccess.php
@@ -1,4 +1,4 @@
 <h2><?php echo __('Edit Ad') ?></h2>
 
 
-<?php include_partial('form', array('form' => $form)) ?>
+<?php include_partial('form', array('form' => $form, 'page' => $page)) ?>
diff --git a/apps/companyfront/modules/ad/templates/indexSuccess.php b/apps/companyfront/modules/ad/templates/indexSuccess.php
index 810802e..7289357 100644
--- a/apps/companyfront/modules/ad/templates/indexSuccess.php
+++ b/apps/companyfront/modules/ad/templates/indexSuccess.php
@@ -12,7 +12,12 @@
   </table>
 </form>
 
-<?php include_partial('ad/list', array('ads' => $pager->getResults(), 'userLanguageId' => $userLanguageId)) ?>
+<?php if ($pager->haveToPaginate()): ?>
+    <?php include_partial('ad/list', array('ads' => $pager->getResults(), 'userLanguageId' => $userLanguageId, 'page' => $pager->getPage())) ?>
+<?php else: ?>
+    <?php include_partial('ad/list', array('ads' => $pager->getResults(), 'userLanguageId' => $userLanguageId, 'page' => '1')) ?>
+<?php endif; ?>
+
 
 <?php if ($pager->haveToPaginate()): ?>
   <div class="pagination">
@@ -34,5 +39,9 @@
   </div>
 <?php endif; ?>
 
-  <a href="<?php echo url_for('ad/new') ?>" class="bt_green"><span class="bt_green_lft"></span><strong><?php echo __('New Ad') ?></strong><span class="bt_green_r"></span></a>
 
+<?php if ($pager->haveToPaginate()): ?>
+    <a href="<?php echo url_for('ad/new?page='.$pager->getPage()) ?>" class="bt_green"><span class="bt_green_lft"></span><strong><?php echo __('Create new Ad') ?></strong><span class="bt_green_r"></span></a>
+<?php else: ?>
+    <a href="<?php echo url_for('ad/new?page=1') ?>" class="bt_green"><span class="bt_green_lft"></span><strong><?php echo __('Create new Ad') ?></strong><span class="bt_green_r"></span></a>
+<?php endif; ?>
diff --git a/apps/companyfront/modules/ad/templates/newSuccess.php b/apps/companyfront/modules/ad/templates/newSuccess.php
index 2c9e131..13dcbf3 100644
--- a/apps/companyfront/modules/ad/templates/newSuccess.php
+++ b/apps/companyfront/modules/ad/templates/newSuccess.php
@@ -1,3 +1,3 @@
 <h2><?php echo __('New Ad') ?></h2>
 
-<?php include_partial('form', array('form' => $form)) ?>
+<?php include_partial('form', array('form' => $form, 'page' => $page)) ?>
-- 
2.1.4