From 3d04fb75a980dba20e51dc91afd49f0eb9ee43fe Mon Sep 17 00:00:00 2001
From: Simon
Date: Wed, 9 Mar 2011 16:31:58 +0100
Subject: Form-Verhalten geändert & Datenbank korrigiert
---
application/controllers/ClientController.php | 21 +++-----
application/controllers/FilterController.php | 78 +++++++++++-----------------
application/controllers/PoolController.php | 20 +++----
application/forms/FilterAdd.php | 24 +++++----
application/views/scripts/filter/index.phtml | 11 ++--
application/views/scripts/pool/index.phtml | 22 +++++---
pbs-data.sql | 6 ++-
public/media/css/style.css | 5 +-
8 files changed, 91 insertions(+), 96 deletions(-)
diff --git a/application/controllers/ClientController.php b/application/controllers/ClientController.php
index ff663ba..580eb6e 100644
--- a/application/controllers/ClientController.php
+++ b/application/controllers/ClientController.php
@@ -16,16 +16,15 @@ class ClientController extends Zend_Controller_Action
public function addclientAction()
{
- $mac = $this->_request->getParam('mac');
- $hh = $this->_request->getParam('hh');
+ $mac = $this->_request->getParam('mac');
+ $hh = $this->_request->getParam('hh');
if (!isset($_POST["add"])){
- $addclient = new Application_Form_Client();
- $this->view->addclient = $addclient;
+ $addclient = new Application_Form_Client();
+ $this->view->addclient = $addclient;
}
else{
$addfilterform = new Application_Form_Client($_POST);
- print_a($_POST,$addfilterform->isValid($_POST));
if ($addfilterform->isValid($_POST) || ($mac != '' && $hh != '') ) {
$client = new Application_Model_Client();
$mac = ($mac!='')?$mac:$_POST['macadress'];
@@ -37,9 +36,7 @@ class ClientController extends Zend_Controller_Action
print_a('inserted');
$this->_redirect('/client');
}
- else{
- print_a('no insert');
- }
+ $this->view->addclient = $addclient;
}
}
@@ -69,8 +66,8 @@ class ClientController extends Zend_Controller_Action
$this->view->editclient = $editclient;
}
else{
- $addfilterform = new Application_Form_Client($_POST);
- if ($addfilterform->isValid($_POST) || ($mac != '' && $hh != '') ) {
+ $editclient = new Application_Form_Client($_POST);
+ if ($editclient->isValid($_POST) || ($mac != '' && $hh != '') ) {
$client = new Application_Model_Client($_POST);
$client->setID($this->_request->getParam('clientID'));
$clientmapper = new Application_Model_ClientMapper();
@@ -78,9 +75,7 @@ class ClientController extends Zend_Controller_Action
print_a('updated');
$this->_redirect('/client');
}
- else{
- print_a('no update');
- }
+ $this->view->editclient = $editclient;
}
}
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 54bcb19..2853706 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -19,27 +19,27 @@ class FilterController extends Zend_Controller_Action
public function indexAction()
{
try{
- $this->_filtermapper = new Application_Model_FilterMapper();
- $this->view->filters = $this->_filtermapper->fetchAll();
+ $this->_filtermapper = new Application_Model_FilterMapper();
+ $this->view->filters = $this->_filtermapper->fetchAll();
}catch (Zend_Exception $e) {
- echo "Error message 2: " . $e->getMessage() . "\n";
+ echo "Error message 2: " . $e->getMessage() . "\n";
}
}
public function addfilterAction()
{
- if (!isset($_POST["add"])){
- $addfilterform = new Application_Form_FilterAdd();
- $this->view->addfilterform = $addfilterform;
+ $bmmapper = new Application_Model_BootMenuMapper();
+ //TODO get bootmenu by group
+ $bootmenus = $bmmapper->fetchAll();
+ if (!isset($_POST["add"])){
+ $addfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus));
+ $this->view->addfilterform = $addfilterform;
}else {
- $addfilterform = new Application_Form_FilterAdd($_POST);
+ $addfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus),$_POST);
if ($addfilterform->isValid($_POST)) {
try{
- $newfilter = new Application_Model_Filter();
- $newfilter->setTitle($_POST['title']);
+ $newfilter = new Application_Model_Filter($_POST);
$newfilter->setCreated(time());
- $newfilter->setDescription($_POST['description']);
- $newfilter->setPriority($_POST['priority']);
// TODO: Ändere mit ACL
$newfilter->setGroupID('1');
@@ -54,6 +54,7 @@ class FilterController extends Zend_Controller_Action
echo "Error message 2: " . $e->getMessage() . "\n";
}
}
+ $this->view->addfilterform = $addfilterform;
}
}
@@ -73,6 +74,9 @@ class FilterController extends Zend_Controller_Action
public function editfilterAction()
{
+ $bmmapper = new Application_Model_BootMenuMapper();
+ //TODO get bootmenu by group
+ $bootmenus = $bmmapper->fetchAll();
if (!isset($_POST["add"])){
// TODO: ACL implementieren ob er editieren darf
$filterID = $this->_request->getParam('filterID');
@@ -83,7 +87,7 @@ class FilterController extends Zend_Controller_Action
$filtermapper->find($filterID,$filter);
$filter2 = $filter->toArray();
- $editfilterform = new Application_Form_FilterAdd();
+ $editfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus));
$editfilterform->populate($filter2);
$this->view->editfilterform = $editfilterform;
@@ -91,7 +95,7 @@ class FilterController extends Zend_Controller_Action
try{
$filterID = $this->_request->getParam('filterID');
- $editfilterform = new Application_Form_FilterAdd($_POST);
+ $editfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus),$_POST);
//TODO: ACL integrieren
$_POST['groupID'] = 1;
$_POST['membershipID'] = 1;
@@ -102,16 +106,13 @@ class FilterController extends Zend_Controller_Action
$newfilterenty->setID($this->_request->getParam('filterID'));
$newfilter2 = new Application_Model_FilterMapper();
$newfilter2->save($newfilterenty);
- echo 'valid';
- }
- else
- {
- echo 'not valid';
- }
+ echo 'valid';
+ $this->_redirect('/filter');
+ }
+ $this->view->editfilterform = $editfilterform;
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
- $this->_redirect('/filter');
}
}
@@ -120,23 +121,15 @@ class FilterController extends Zend_Controller_Action
// TODO: ACL implementieren ob er editieren darf
if (!isset($_POST["add"])){
- echo "case1";
try{
$editfilterform = new Application_Form_FilterEntriesAdd(array('filterID' => $this->_request->getParam('filterID')));
$this->view->editfilterform = $editfilterform;
- echo "
-| ClientID | MacAdress | Hardwarehash |
-pools as $pool): ?>
- escape($pool->getTitle()) ?> |
-
+
|---|
+| ClientID |
+MacAdress |
+Hardwarehash |
+Actions |
freeclients as $client): ?>
@@ -92,7 +99,8 @@ foreach ($this->freeclients as $client): ?>
|
|
|
- |