summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/controllers/FilterController.php5
-rw-r--r--application/views/scripts/filter/index.phtml8
-rwxr-xr-xzend-einrichten.sh2
3 files changed, 14 insertions, 1 deletions
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index d066c53..d631083 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -65,6 +65,11 @@ class FilterController extends Zend_Controller_Action
// TODO: ACL implementieren ob er den filter löschen darf
if(is_numeric($filterID)){
// TODO: lösche den aktuellen eintrag
+ $deletefilter = new Application_Model_Filter();
+ $deletefilter->setID($filterID);
+ $filtermapper = new Application_Model_FilterMapper();
+ $filtermapper->delete($deletefilter);
+ $this->_redirect('/filter');
}
// action body
}
diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index 33043dc..19b21cc 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -27,6 +27,14 @@
),
'default',
true) ?>">edit filter</a></td>
+ <td><a href="<?php echo $this->url(
+ array(
+ 'controller' => 'filter',
+ 'action' => 'deletefilter',
+ 'filterID' => $filter->getID()
+ ),
+ 'default',
+ true) ?>">edit filter</a></td>
</tr>
<?php endforeach ?>
diff --git a/zend-einrichten.sh b/zend-einrichten.sh
index 46b685b..483433e 100755
--- a/zend-einrichten.sh
+++ b/zend-einrichten.sh
@@ -27,5 +27,5 @@ echo " </VirtualHost>" >> /etc/apache2/sites-available/pbs2
ln -s /etc/apache2/sites-available/pbs2 /etc/apache2/sites-enabled/pbs2
echo "127.0.0.2 pbs2.local" >> /etc/hosts
/etc/init.d/apache2 restart
-mysql -u root -plsfks-openslx < /tmp/pbs2/pbs.sql
+mysql -u root -p < /tmp/pbs2/pbs.sql
su sf34 -c "cp ~/pbs2/application/configs/application.ini /tmp/pbs2/application/configs/application.ini"