summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorsebastian wagner2011-09-14 17:18:12 +0200
committersebastian wagner2011-09-14 17:18:12 +0200
commit61760dc8f7598afaa31f6416b61e900faaabf9f0 (patch)
treedba798010e2cb94700d86804e8554a361e43b92b /application
parentimmediate check (diff)
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-61760dc8f7598afaa31f6416b61e900faaabf9f0.tar.gz
poolctrl-61760dc8f7598afaa31f6416b61e900faaabf9f0.tar.xz
poolctrl-61760dc8f7598afaa31f6416b61e900faaabf9f0.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php6
-rwxr-xr-xapplication/forms/EventAdd.php2
-rwxr-xr-xapplication/forms/EventEdit.php2
3 files changed, 7 insertions, 3 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 43e33a9..8b982bf 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -471,7 +471,7 @@ class EventController extends Zend_Controller_Action
* START CALENDAR FUNCTIONS
* ------------------------
*/
-
+
public function deleteallAction() {
if (!$this->acl->checkRight('ed')) {
$this->_redirect('/');
@@ -495,8 +495,8 @@ class EventController extends Zend_Controller_Action
try {
foreach($events as $event) {
$this->eventMapper->delete($event);
- }
-
+ }
+
} catch (Zend_Exception $e) {
echo "Caught exception: " . get_class($e) . "<br/>";
echo "Message: " . $e->getMessage() . "<br/>";
diff --git a/application/forms/EventAdd.php b/application/forms/EventAdd.php
index e7f0465..90d25f6 100755
--- a/application/forms/EventAdd.php
+++ b/application/forms/EventAdd.php
@@ -123,10 +123,12 @@ class Application_Form_EventAdd extends Zend_Form
'filters' => array('StringTrim'),
'validators' => array(
array('StringLength', false, array(0, 30)),
+ array('TitleUnique', false, array()),
),
'required' => true,
'label' => 'Title:',
));
+ $this->getElement('title')->addPrefixPath('Poolctrl_Validate', 'Poolctrl/Validator/', 'validate');
$this->addElement('checkbox', 'immediate', array(
'onchange' => 'immediateChanged("immediate")',
diff --git a/application/forms/EventEdit.php b/application/forms/EventEdit.php
index e6a4c7a..1aa7d1d 100755
--- a/application/forms/EventEdit.php
+++ b/application/forms/EventEdit.php
@@ -78,11 +78,13 @@ class Application_Form_EventEdit extends Zend_Form
'filters' => array('StringTrim'),
'validators' => array(
array('StringLength', false, array(0, 30)),
+ array('TitleUnique', false, array()),
),
'required' => true,
'label' => 'Title:',
'value' => $this->params['title'],
));
+ $this->getElement('title')->addPrefixPath('Poolctrl_Validate', 'Poolctrl/Validator/', 'validate');
$this->addElement('text', 'start', array(
'filters' => array('StringTrim'),