diff options
| author | michael pereira | 2011-03-06 12:59:40 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-06 12:59:40 +0100 |
| commit | d9e9eb09bacb86f1a86930b6cf5cafd41ce23462 (patch) | |
| tree | 90bfc6f6af190f7a7de40be9b100cc2b2a205c56 /application/views/scripts | |
| parent | Tabelle Userconfig hinzugefuegt (diff) | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-d9e9eb09bacb86f1a86930b6cf5cafd41ce23462.tar.gz pbs2-d9e9eb09bacb86f1a86930b6cf5cafd41ce23462.tar.xz pbs2-d9e9eb09bacb86f1a86930b6cf5cafd41ce23462.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/views/scripts')
| -rw-r--r-- | application/views/scripts/filter/addfilter.phtml | 2 | ||||
| -rw-r--r-- | application/views/scripts/filter/editfilter.phtml | 7 | ||||
| -rw-r--r-- | application/views/scripts/filter/index.phtml | 8 |
3 files changed, 6 insertions, 11 deletions
diff --git a/application/views/scripts/filter/addfilter.phtml b/application/views/scripts/filter/addfilter.phtml index 3c87e1e..40b4ccf 100644 --- a/application/views/scripts/filter/addfilter.phtml +++ b/application/views/scripts/filter/addfilter.phtml @@ -1,3 +1,3 @@ <?php -$this->addfilterform->setAction($this->url()); +#$this->addfilterform->setAction($this->url()); echo $this->addfilterform; diff --git a/application/views/scripts/filter/editfilter.phtml b/application/views/scripts/filter/editfilter.phtml index e3d1c36..62e9684 100644 --- a/application/views/scripts/filter/editfilter.phtml +++ b/application/views/scripts/filter/editfilter.phtml @@ -1,11 +1,6 @@ <h1>Edit Filter</h1> <?php -echo "<h2>".$this->filterID."</h2>"; -echo 'test'; -?> ------------ -<?php -echo + $this->editfilterform->setAction($this->url()); diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index 66f3e7f..fb195a3 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -67,8 +67,10 @@ tr.filter{background-color:#DDD;} $erg = new Application_Model_FilterType(); $filter2->find($filterentry->getFiltertypeID(),$erg); //name zur ID finden + echo "[".$filterentry->getFiltertypeID()."] "; echo $erg->getFiltertypename(); + ?></td> <td><?php echo $filterentry->getFiltervalue();?></td> <td><?php echo $filterentry->getFiltervalue2();?></td> @@ -76,8 +78,7 @@ tr.filter{background-color:#DDD;} array( 'controller' => 'filter', 'action' => 'editfilterentry', - 'filterID' => $filter->getID(), - 'filtertypeID' => $filterentry->getFiltertypeID() + 'filterentriesID' => $filterentry->getID() ), 'default', true) ?>">edit filterentry</a> @@ -85,8 +86,7 @@ tr.filter{background-color:#DDD;} array( 'controller' => 'filter', 'action' => 'removefilterentry', - 'filterID' => $filter->getID(), - 'filtertypeID' => $filterentry->getFiltertypeID() + 'filterentriesID' => $filterentry->getID() ), 'default', true) ?>">remove filterentry</a> |