summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSimon2011-03-06 13:32:09 +0100
committerSimon2011-03-06 13:32:09 +0100
commit79c0af755487c51e98f91d977bcbcfce61955ad0 (patch)
treec8dbc7df42c622837238f7475a9eabdb08e788b2 /application
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-79c0af755487c51e98f91d977bcbcfce61955ad0.tar.gz
pbs2-79c0af755487c51e98f91d977bcbcfce61955ad0.tar.xz
pbs2-79c0af755487c51e98f91d977bcbcfce61955ad0.zip
sql-files aufgeräumt && filter geändert
Diffstat (limited to 'application')
-rw-r--r--application/controllers/FilterController.php20
-rw-r--r--application/forms/FilterAdd.php6
-rw-r--r--application/forms/FilterEntriesAdd.php4
-rw-r--r--application/views/scripts/filter/editfilter.phtml5
4 files changed, 19 insertions, 16 deletions
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index fc1ce8d..55188cf 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -81,6 +81,7 @@ class FilterController extends Zend_Controller_Action
// TODO: ACL implementieren ob er editieren darf
$filterID = $this->_request->getParam('filterID');
$filter = new Application_Model_Filter();
+
$filtermapper = new Application_Model_FilterMapper();
$filtermapper->find($filterID,$filter);
@@ -92,8 +93,9 @@ class FilterController extends Zend_Controller_Action
} else{
try{
- echo "<pre>";print_r($_POST);echo "</pre>";
- $editfilterform = new Application_Form_FilterAdd();
+ $filterID = $this->_request->getParam('filterID');
+
+ $editfilterform = new Application_Form_FilterAdd($_POST);
//TODO: ACL integrieren
$_POST['groupID'] = 1;
$_POST['membershipID'] = 1;
@@ -104,9 +106,13 @@ class FilterController extends Zend_Controller_Action
$newfilterenty = new Application_Model_Filter($_POST);
$newfilterenty->setID($this->_request->getParam('filterID'));
$newfilter2 = new Application_Model_FilterMapper();
- $newfilter2->save($newfilterenty);
- }
-
+ $newfilter2->save($newfilterenty);
+ echo 'valid';
+ }
+ else
+ {
+ echo 'not valid';
+ }
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
@@ -123,7 +129,9 @@ class FilterController extends Zend_Controller_Action
try{
$editfilterform = new Application_Form_FilterEntriesAdd(array('filterID' => $this->_request->getParam('filterID')));
$this->view->editfilterform = $editfilterform;
- echo "<pre>case 1.1</pre>";
+ echo "<pre style='padding:5px;border:1px solid black;background-color:#3CF'>";
+ print_r(array('debug','case1'));
+ echo "</pre>";
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
diff --git a/application/forms/FilterAdd.php b/application/forms/FilterAdd.php
index c3395c6..43efb71 100644
--- a/application/forms/FilterAdd.php
+++ b/application/forms/FilterAdd.php
@@ -4,7 +4,7 @@ class Application_Form_FilterAdd extends Zend_Form
{
public function init()
- {
+ {
$this->setName("Add Filter");
$this->setMethod('post');
@@ -18,7 +18,7 @@ class Application_Form_FilterAdd extends Zend_Form
));
$this->addElement('textarea', 'description', array(
'filters' => array('StringTrim'),
- 'required' => true,
+ 'required' => false,
'label' => 'Description:',
));
$this->addElement('text', 'priority', array(
@@ -29,7 +29,7 @@ class Application_Form_FilterAdd extends Zend_Form
'required' => true,
'label' => 'Priority:',
));
- $submit = $this->addElement('submit', 'add', array(
+ $this->addElement('submit', 'add', array(
'required' => false,
'ignore' => true,
'label' => 'Save',
diff --git a/application/forms/FilterEntriesAdd.php b/application/forms/FilterEntriesAdd.php
index 2fd19ae..7b3f52b 100644
--- a/application/forms/FilterEntriesAdd.php
+++ b/application/forms/FilterEntriesAdd.php
@@ -10,14 +10,12 @@ class Application_Form_FilterEntriesAdd extends Zend_Form
$this->setName("Add Filterentry");
$this->setMethod('post');
-
try{
$filtertypemapper = new Application_Model_FilterTypeMapper();
$filtertype = $filtertypemapper->fetchAll();
}catch (Zend_Exception $e) {
echo "Error message 1: " . $e->getMessage() . "\n";
- }
-
+ }
$filtertypes = $this->createElement('select','filtertypeID');
$filtertypes ->setLabel('Type:');
foreach($filtertype as $f){
diff --git a/application/views/scripts/filter/editfilter.phtml b/application/views/scripts/filter/editfilter.phtml
index 62e9684..8bc38f7 100644
--- a/application/views/scripts/filter/editfilter.phtml
+++ b/application/views/scripts/filter/editfilter.phtml
@@ -1,11 +1,8 @@
<h1>Edit Filter</h1>
<?php
-
$this->editfilterform->setAction($this->url());
-
-
-$this->editfilterform;
+echo $this->editfilterform;
?>