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

Fix user settings again for Super Admins, also Zend routing tweak

Browse source 
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
This commit is contained in:
Albert Santoni 2014-08-01 12:50:02 -04:00
parent d320651735
commit 1c676dee6d
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/controllers/UserController.php
View file

@ -133,6 +133,14 @@ class UserController extends Zend_Controller_Action
if ($form->isValid($formData) &&
$form->validateLogin($formData['cu_login'], $formData['cu_user_id'])) {
$user = new Application_Model_User($formData['cu_user_id']);
//Stupid hack because our schema enforces non-null first_name
//even though by default the admin user has no first name... (....)
if (Application_Model_User::getCurrentUser()->isSuperAdmin()) {
if (empty($formData['cu_first_name'])) {
$formData['cu_first_name'] = "admin";
$formData['cu_last_name'] = "admin"; //ditto, avoid non-null DB constraint
}
}
$user->setFirstName($formData['cu_first_name']);
$user->setLastName($formData['cu_last_name']);
// We don't allow 6 x's as a password.