From a1f716c45f882365e02a072b42a9ad05d34a39df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Mon, 28 Jun 2010 16:13:14 +0200 Subject: [PATCH] Restructure to have the index action present an overview MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The index action should display an overview over the available actions Signed-off-by: Michael Tänzer --- .../application/controllers/AddPointsController.php | 12 ++++-------- .../add-points/{index.phtml => assuranceform.phtml} | 0 2 files changed, 4 insertions(+), 8 deletions(-) rename manager/application/views/scripts/add-points/{index.phtml => assuranceform.phtml} (100%) diff --git a/manager/application/controllers/AddPointsController.php b/manager/application/controllers/AddPointsController.php index 0371718..95b524b 100644 --- a/manager/application/controllers/AddPointsController.php +++ b/manager/application/controllers/AddPointsController.php @@ -21,21 +21,17 @@ class AddPointsController extends Zend_Controller_Action public function indexAction() { - $this->view->assurance_form = $this->getAssuranceForm(); - $this->render('index'); + // Just render the view + return; } public function assuranceAction() { // Validate form - if (!$this->getRequest()->isPost()) { - return $this->_forward('index'); - } - $form = $this->getAssuranceForm(); - if (!$form->isValid($_POST)) { + if (!$this->getRequest()->isPost() || !$form->isValid($_POST)) { $this->view->assurance_form = $form; - return $this->render('index'); + return $this->render('assuranceform'); } // Form is valid -> get values for processing diff --git a/manager/application/views/scripts/add-points/index.phtml b/manager/application/views/scripts/add-points/assuranceform.phtml similarity index 100% rename from manager/application/views/scripts/add-points/index.phtml rename to manager/application/views/scripts/add-points/assuranceform.phtml