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

SAAS-879 and add FAQ to Help menu 

* SAAS-879: When trying to save changes in the user setting pages
  changes do not save and goes to a "an error hass occured page"
This commit is contained in:
Albert Santoni 2015-06-19 14:22:58 -04:00
parent 627343a626
commit 19adb062cf
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/configs/navigation.php
View File

@ -133,6 +133,11 @@ $pages = array(
'action' => 'help',
'resource' => 'dashboard'
),
array(
'label' => _('FAQ'),
'uri' => "https://sourcefabricberlin.zendesk.com/hc/en-us/sections/200994309-Airtime-FAQ",
'target' => "_blank"
),
array(
'label' => _('User Manual'),
'uri' => "http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters",

9
airtime_mvc/application/controllers/UserController.php
View File

@ -138,8 +138,13 @@ class UserController extends Zend_Controller_Action
$formData['cu_last_name'] = "admin"; //ditto, avoid non-null DB constraint
}
}
$user->setFirstName($formData['cu_first_name']);
$user->setLastName($formData['cu_last_name']);
if (isset($formData['cu_first_name'])) {
$user->setFirstName($formData['cu_first_name']);
}
if (isset($formData['cu_last_name'])) {
$user->setLastName($formData['cu_last_name']);
}
// We don't allow 6 x's as a password.
// The reason is because we use that as a password placeholder
// on the client side.

11
airtime_mvc/application/forms/EditUser.php
View File

@ -157,10 +157,13 @@ class Application_Form_EditUser extends Zend_Form
// We need to add the password identical validator here in case
// Zend version is less than 1.10.5
public function isValid($data) {
$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
$data['cu_password']);
$this->getElement('cu_passwordVerify')->addValidator($passwordIdenticalValidator);
public function isValid($data)
{
if (isset($data['cu_password'])) {
$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
$data['cu_password']);
$this->getElement('cu_passwordVerify')->addValidator($passwordIdenticalValidator);
}
return parent::isValid($data);
}
}