summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/configs/application.ini.dist5
-rw-r--r--application/controllers/GearmanController.php2
-rw-r--r--application/models/Event.php12
-rw-r--r--application/models/EventMapper.php8
4 files changed, 20 insertions, 7 deletions
diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist
index 123c33f..6176733 100644
--- a/application/configs/application.ini.dist
+++ b/application/configs/application.ini.dist
@@ -16,6 +16,8 @@ resources.db.isDefaultTableAdapter = true
resources.db.params.driver_options.1002 = "SET NAMES UTF8;"
resources.view[] = ""
resources.modules = ""
+resources.layout.layout = "default"
+resources.layout.layoutPath = APPLICATION_PATH "/layouts"
pbs2.host =
pbs2.login = /resource/login/
pbs2.checkright = /resource/checkright/apikey
@@ -34,9 +36,6 @@ gearman.server.host =
gearman.server.port =
gearman.worker.waitTime = 120
gearman.worker.updateRate = 1
-
-resources.layout.layout = "default"
-resources.layout.layoutPath = APPLICATION_PATH "/layouts"
[staging : production]
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index 8167275..a0de744 100644
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -2,11 +2,11 @@
class GearmanController extends Zend_Controller_Action
{
- protected $gearmanClient;
protected $config;
protected $pbs2host;
protected $userIDsNamespace;
protected $acl;
+ protected $gearmanClient;
protected $gearmanServerHost;
protected $gearmanServerPort;
protected $gearmanWorkerUpdateRate;
diff --git a/application/models/Event.php b/application/models/Event.php
index 33a470e..7554442 100644
--- a/application/models/Event.php
+++ b/application/models/Event.php
@@ -27,6 +27,7 @@ class Application_Model_Event
protected $_repeat;
protected $_immediate;
protected $_running;
+ protected $_runningType;
protected $_note;
public function __construct(array $options = null)
@@ -276,5 +277,16 @@ class Application_Model_Event
$this->_running = $_running;
return $this;
}
+
+ public function getRunningType()
+ {
+ return $this->_runningType;
+ }
+
+ public function setRunningType($_runningType)
+ {
+ $this->_runningType = $_runningType;
+ return $this;
+ }
}
diff --git a/application/models/EventMapper.php b/application/models/EventMapper.php
index a2648a0..f700b39 100644
--- a/application/models/EventMapper.php
+++ b/application/models/EventMapper.php
@@ -85,7 +85,7 @@ class Application_Model_EventMapper
public function save(Application_Model_Event $event)
{
- $data = array('eventID'=> $event->getID() ,'category'=> $event->getCategory() ,'title'=> $event->getTitle(), 'pbs_membershipID'=> $event->getPbs_membershipID(),'end'=> $event->getEnd() ,'immediate'=> $event->getImmediate() ,'note'=> $event->getNote() ,'participants'=> $event->getParticipants() ,'pbs_bootosID'=> $event->getPbs_bootosID(),'pbs_poolID'=> $event->getPbs_poolID(),'repeat'=> $event->getRepeat(),'start'=> $event->getStart(),'pbs_bootmenuID'=> $event->getPbs_bootmenuID(),'pbs_filterID'=> $event->getPbs_filterID(), 'running' => $event->getRunning() );
+ $data = array('eventID'=> $event->getID() ,'category'=> $event->getCategory() ,'title'=> $event->getTitle(), 'pbs_membershipID'=> $event->getPbs_membershipID(),'end'=> $event->getEnd() ,'immediate'=> $event->getImmediate() ,'note'=> $event->getNote() ,'participants'=> $event->getParticipants() ,'pbs_bootosID'=> $event->getPbs_bootosID(),'pbs_poolID'=> $event->getPbs_poolID(),'repeat'=> $event->getRepeat(),'start'=> $event->getStart(),'pbs_bootmenuID'=> $event->getPbs_bootmenuID(),'pbs_filterID'=> $event->getPbs_filterID(), 'running' => $event->getRunning(), 'runningType' => $event->getRunningType() );
if (null === ($id = $event->getID()) ) {
unset($data['eventID']);
return $this->getDbTable()->insert($data);
@@ -131,7 +131,8 @@ class Application_Model_EventMapper
->setPbs_bootmenuID($row->pbs_bootmenuID)
->setRepeat($row->repeat)
->setStart($row->start)
- ->setRunning($row->running);
+ ->setRunning($row->running)
+ ->setRunningType($row->runningType);
}
public function fetchAll()
@@ -157,7 +158,8 @@ class Application_Model_EventMapper
->setPbs_bootmenuID($row->pbs_bootmenuID)
->setRepeat($row->repeat)
->setStart($row->start)
- ->setRunning($row->running);
+ ->setRunning($row->running)
+ ->setRunningType($row->runningType);
$entries[$row->eventID] = $entry;
}