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

SAAS-945: Language + Timezone Setup Popup

Browse source 
forgot to auto detect user's timezone
This commit is contained in:
drigato 2015-07-27 14:38:42 -04:00
parent ee2bfe7664
commit 989b4994aa
5 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
airtime_mvc/application/controllers/SetupController.php
View file

@ -18,31 +18,24 @@ class SetupController extends Zend_Controller_Action
if ($request->isPost()) {
$postData = $request->getPost();
$formData = array();
foreach ($postData["data"] as $key => $value) {
if ($value["name"] == "csrf") continue;
$formData[$value["name"]] = $value["value"];
}
$formData = $request->getPost();
if ($form->isValid($formData)) {
$userService = new Application_Service_UserService();
$currentUser = $userService->getCurrentUser();
$currentUserId = $currentUser->getDbId();
Application_Model_Preference::SetUserTimezone($formData["timezone"], $currentUserId);
Application_Model_Preference::SetDefaultTimezone($formData["timezone"]);
Application_Model_Preference::SetUserTimezone($formData["setup_timezone"], $currentUserId);
Application_Model_Preference::SetDefaultTimezone($formData["setup_timezone"]);
Application_Model_Preference::SetUserLocale($formData["language"], $currentUserId);
Application_Model_Preference::SetDefaultLocale($formData["language"]);
Application_Model_Preference::SetUserLocale($formData["setup_language"], $currentUserId);
Application_Model_Preference::SetDefaultLocale($formData["setup_language"]);
Application_Model_Preference::setLangTimezoneSetupComplete(true);
$this->_helper->json->sendJson(null);
} else {
$this->_helper->json->sendJson($form->get);
$this->_redirect('/Showbuilder');
}
} else {
$this->_helper->json->sendJson($form);
}
$this->_redirect('/Showbuilder');
}
}

2
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -45,6 +45,7 @@ class ShowbuilderController extends Zend_Controller_Action
//$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/js-timezone-detect/jstz-1.0.4.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/blockui/jquery.blockUI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@ -64,7 +65,6 @@ class ShowbuilderController extends Zend_Controller_Action
// and they have not seen the setup popup before
if ($currentUser->getDbType() == "S" && strpos(strtolower($previousPage), 'login') !== false
&& empty($setupComplete)) {
Logging::info("hello");
$lang_tz_popup_form = new Application_Form_SetupLanguageTimezone();
$this->view->lang_tz_popup_form = $lang_tz_popup_form;
$this->view->headScript()->appendFile($baseUrl.'js/airtime/nowplaying/lang-timezone-setup.js?'.$CC_CONFIG['airtime_version'],'text/javascript');