summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapplication/forms/EventAdd.php18
-rwxr-xr-xapplication/forms/EventEdit.php44
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Shutdown.java1
-rwxr-xr-xpublic/media/js/script.js19
4 files changed, 47 insertions, 35 deletions
diff --git a/application/forms/EventAdd.php b/application/forms/EventAdd.php
index ea04456..f6b2dc6 100755
--- a/application/forms/EventAdd.php
+++ b/application/forms/EventAdd.php
@@ -130,6 +130,12 @@ class Application_Form_EventAdd extends Zend_Form
public function init()
{
+ if(isset($this->bootoslist)) {
+ foreach($this->bootoslist as $bootos) {
+ $bootosIDs[] = $bootos->getID();
+ }
+ }
+
$this->setName('EventAdd');
$this->setMethod('post');
@@ -291,7 +297,7 @@ class Application_Form_EventAdd extends Zend_Form
}
$bootosfield->setRegisterInArrayValidator(false);
- $bootosfield->setAttrib('onchange', "bootosfieldChanged('pbs_bootosID', " . count($this->bootoslist) . ");");
+ $bootosfield->setAttrib('onchange', "bootosfieldChanged('pbs_bootosID', bootosIDs);");
$this->addElement($bootosfield);
foreach($this->configlist as $id => $bootosConfigs) {
@@ -322,10 +328,12 @@ class Application_Form_EventAdd extends Zend_Form
));
echo '<script type="text/javascript">
- addeventcategoryfieldChanged("category");
- immediateChanged("immediate");
- bootosfieldChanged("pbs_bootosID", ' . count($this->bootoslist) . ');
- $(function() {
+ addeventcategoryfieldChanged("category");
+ immediateChanged("immediate");';
+ $ids = implode(", ", $bootosIDs);
+ echo "\nbootosIDs = new Array(" . $ids . ");\n";
+ echo 'bootosfieldChanged("pbs_bootosID", bootosIDs);
+ $(function() {
$("#start").datetimepicker({
dateFormat: "mm/dd/yy",
timeFormat: "hh:mm tt",
diff --git a/application/forms/EventEdit.php b/application/forms/EventEdit.php
index a28793e..6189684 100755
--- a/application/forms/EventEdit.php
+++ b/application/forms/EventEdit.php
@@ -343,7 +343,7 @@ class Application_Form_EventEdit extends Zend_Form
}
$bootosfield->setRegisterInArrayValidator(false);
- $bootosfield->setAttrib('onchange', "bootosfieldChanged('pbs_bootosID', " . count($this->bootoslist) . ");");
+ $bootosfield->setAttrib('onchange', "bootosfieldChanged('pbs_bootosID', bootosIDs);");
$bootosfield->setValue( $this->params['pbs_bootosID']);
$this->addElement($bootosfield);
@@ -378,25 +378,27 @@ class Application_Form_EventEdit extends Zend_Form
'onclick' => 'location.href="/event/"',
));
- echo '<script type="text/javascript">
- bootosfieldChanged("pbs_bootosID", ' . count($this->bootoslist) . ');
- $(function() {
- $("#start").datetimepicker({
- dateFormat: "mm/dd/yy",
- timeFormat: "hh:mm tt",
- ampm: true
- });
- $("#end").datetimepicker({
- dateFormat: "mm/dd/yy",
- timeFormat: "hh:mm tt",
- ampm: true
- });
- $("#repeatdate").datetimepicker({
- dateFormat: "mm/dd/yy",
- timeFormat: "hh:mm tt",
- ampm: true
- });
- });
- </script>';
+ echo '<script type="text/javascript">';
+ $ids = implode(", ", $bootosIDs);
+ echo "\nbootosIDs = new Array(" . $ids . ");\n";
+ echo 'bootosfieldChanged("pbs_bootosID", ' . count($this->bootoslist) . ');
+ $(function() {
+ $("#start").datetimepicker({
+ dateFormat: "mm/dd/yy",
+ timeFormat: "hh:mm tt",
+ ampm: true
+ });
+ $("#end").datetimepicker({
+ dateFormat: "mm/dd/yy",
+ timeFormat: "hh:mm tt",
+ ampm: true
+ });
+ $("#repeatdate").datetimepicker({
+ dateFormat: "mm/dd/yy",
+ timeFormat: "hh:mm tt",
+ ampm: true
+ });
+ });
+ </script>';
}
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index 9920acc..63ecd42 100755
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -419,6 +419,7 @@ public class Shutdown extends Thread {
client.setState(
ClientState.PING_SHUTDOWN_AGAIN,
gearmanClient);
+ client.removeJob(pingJobShutdown);
}
} else {
logger
diff --git a/public/media/js/script.js b/public/media/js/script.js
index 996deee..6232bae 100755
--- a/public/media/js/script.js
+++ b/public/media/js/script.js
@@ -230,17 +230,18 @@ function repeatendChanged(name) {
}
}
-function bootosfieldChanged(name, bootosCount) {
+function bootosfieldChanged(name, bootosIDs) {
value = getElementValue(name);
- for (i = 1; i <= bootosCount; i++) {
- if (value == i) {
- setElementVisible("pbs_configID_" + i + "-label");
- setElementVisible("pbs_configID_" + i + "-element");
- enableElement("pbs_configID_" + i);
+ for (i = 0; i < bootosIDs.length; i++) {
+ id = bootosIDs[i];
+ if (value == id) {
+ setElementVisible("pbs_configID_" + id + "-label");
+ setElementVisible("pbs_configID_" + id + "-element");
+ enableElement("pbs_configID_" + id);
} else {
- setElementInvisible("pbs_configID_" + i + "-label");
- setElementInvisible("pbs_configID_" + i + "-element");
- disableElement("pbs_configID_" + i);
+ setElementInvisible("pbs_configID_" + id + "-label");
+ setElementInvisible("pbs_configID_" + id + "-element");
+ disableElement("pbs_configID_" + id);
}
}
} \ No newline at end of file