summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-05 12:25:45 +0200
committerBjörn Geiger2011-08-05 12:25:45 +0200
commit22681dc83aa43c932540581e4210c3a2c63c52cb (patch)
tree018152a43f13f01ad596f5b58dd2e5f116097728 /application
parentEvent Action wieder entfernt (diff)
downloadpoolctrl-22681dc83aa43c932540581e4210c3a2c63c52cb.tar.gz
poolctrl-22681dc83aa43c932540581e4210c3a2c63c52cb.tar.xz
poolctrl-22681dc83aa43c932540581e4210c3a2c63c52cb.zip
Commit von gerade korrigiert
Diffstat (limited to 'application')
-rw-r--r--application/controllers/EventController.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 43da76a..abad963 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -14,7 +14,6 @@ class EventController extends Zend_Controller_Action
{
protected $eventMapper;
protected $eventcategoryMapper;
- protected $eventactionMapper;
protected $membershipMapper;
protected $config;
protected $pbs2host;
@@ -30,7 +29,6 @@ class EventController extends Zend_Controller_Action
if($this->userIDsNamespace['membershipID'] !='') {
$this->eventMapper = new Application_Model_EventMapper();
$this->eventcategoryMapper = new Application_Model_EventcategoryMapper();
- $this->eventactionMapper = new Application_Model_EventactionMapper();
$this->membershipMapper = new Application_Model_MembershipMapper();
} else {
$this->_helper->redirector('selectmembership', 'person');
@@ -228,7 +226,6 @@ class EventController extends Zend_Controller_Action
public function editAction()
{
$eventcategorylist = $this->eventcategoryMapper->fetchAll();
- $eventactionlist = $this->eventactionMapper->fetchAll();
$bootOsApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getbootoss'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
$bootOsXMLString = $bootOsApiResult['http-body'];
if(strlen($bootOsXMLString) > 0) {
@@ -323,7 +320,7 @@ class EventController extends Zend_Controller_Action
$this->getRequest()->setParam('pbs_bootosID', $event->getPbs_bootosID());
$this->getRequest()->setParam('pbs_membershipID', $event->getPbs_membershipID());
$params = $this->getRequest()->getParams();
- $editForm = new Application_Form_EventEdit(array('eventcategorylist' => $eventcategorylist, 'eventactionlist' => $eventactionlist, 'bootoslist' => $bootoslist, 'poollist' => $poollist , 'params' => $params));
+ $editForm = new Application_Form_EventEdit(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist , 'params' => $params));
}
$this->view->editForm = $editForm;
$this->view->params = $params;