Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

Browse source
This commit is contained in:
denise 2013-10-01 08:49:10 -04:00
commit 3d9bc85fa0
15 changed files with 131 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/forms/AddUser.php
View file

@ -1,4 +1,5 @@
<?php
require_once( __DIR__ . '/../validate/NotDemoValidate.php');
class Application_Form_AddUser extends Zend_Form
{
@ -12,7 +13,8 @@ class Application_Form_AddUser extends Zend_Form
* */
$notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
$emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
$notDemoValidator = new Application_Validate_NotDemoValidate();
$this->setAttrib('id', 'user_form');
$hidden = new Zend_Form_Element_Hidden('user_id');
@ -42,6 +44,7 @@ class Application_Form_AddUser extends Zend_Form
$passwordVerify->setRequired(true);
$passwordVerify->addFilter('StringTrim');
$passwordVerify->addValidator($notEmptyValidator);
$passwordVerify->addValidator($notDemoValidator);
$this->addElement($passwordVerify);
$firstName = new Zend_Form_Element_Text('first_name');

2
airtime_mvc/application/forms/EditHistoryItem.php
View file

@ -43,7 +43,7 @@ class Application_Form_EditHistoryItem extends Application_Form_EditHistory
$ends->addFilter('StringTrim');
$ends->setLabel(_('End Time'));
$ends->setDecorators(array('ViewHelper'));
$ends->setRequired(true);
//$ends->setRequired(true);
$this->addElement($ends);
}

5
airtime_mvc/application/forms/EditUser.php
View file

@ -1,4 +1,5 @@
<?php
require_once( __DIR__ . '/../validate/NotDemoValidate.php');
class Application_Form_EditUser extends Zend_Form
{
@ -16,7 +17,8 @@ class Application_Form_EditUser extends Zend_Form
$userData = Application_Model_User::GetUserData($currentUserId);
$notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
$emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
$notDemoValidator = new Application_Validate_NotDemoValidate();
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
$this->setAttrib('id', 'current-user-form');
@ -52,6 +54,7 @@ class Application_Form_EditUser extends Zend_Form
$passwordVerify->setRequired(true);
$passwordVerify->addFilter('StringTrim');
$passwordVerify->addValidator($notEmptyValidator);
$passwordVerify->addValidator($notDemoValidator);
$passwordVerify->setDecorators(array('viewHelper'));
$this->addElement($passwordVerify);