Environment Settings Update
This commit is contained in:
@@ -291,10 +291,10 @@ class Configurations // extends Configuration
|
||||
function getFormats(){
|
||||
if (!isset($this->UserConfig)) $this->UserConfig = $this->getConfiguration('ENVIRONMENT_SETTINGS', '');
|
||||
$formats = Array();
|
||||
$formats['FullNameFormat'] = isset($this->UserConfig['format']) ? $this->UserConfig['format'] : '@lastName @firstName (@userName)';
|
||||
$formats['FullNameFormat'] = isset($this->UserConfig['format']) ? $this->UserConfig['format'] : '@lastName, @firstName (@userName)';
|
||||
$formats['DateFormat'] = isset($this->UserConfig['dateFormat']) ? $this->UserConfig['dateFormat'] : 'm/d/Y';
|
||||
$formats['CasesListDateFormat'] = isset($this->UserConfig['casesListDateFormat']) ? $this->UserConfig['casesListDateFormat'] : 'm/d/Y';
|
||||
$formats['CasesListRowNumber'] = isset($this->UserConfig['casesListRowNumber']) ? $this->UserConfig['casesListRowNumber'] : 10;
|
||||
$formats['CasesListRowNumber'] = isset($this->UserConfig['casesListRowNumber']) ? $this->UserConfig['casesListRowNumber'] : '10';
|
||||
$formats['TimeZone'] = date('T');
|
||||
return $formats;
|
||||
}
|
||||
|
||||
@@ -1,30 +1,31 @@
|
||||
<?php
|
||||
G::loadClass('configuration');
|
||||
$oConf = new Configurations;
|
||||
$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
|
||||
$c = new Configurations;
|
||||
//$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
|
||||
|
||||
//translations array
|
||||
$translations = G::getTranslations(Array(
|
||||
'ID_PM_ENV_SETTINGS_TITLE', 'ID_PM_ENV_SETTINGS_USERFIELDSET_TITLE', 'IS_USER_NAME_DISPLAY_FORMAT', 'ID_SAVE_SETTINGS',
|
||||
'ID_LAN_UPDATE_DATE', 'ID_SAVING_ENVIRONMENT_SETTINGS', 'ID_ENVIRONMENT_SETTINGS_MSG_1',
|
||||
'ID_PM_ENV_SETTINGS_REGIONFIELDSET_TITLE', 'ID_GLOBAL_DATE_FORMAT', 'ID_PM_ENV_SETTINGS_CASESLIST_TITLE', 'ID_CASES_ROW_NUMBER', 'ID_CASES_DATE_MASK'
|
||||
));
|
||||
$defaultOption = isset($oConf->aConfig['format'])? $oConf->aConfig['format']: '';
|
||||
$defaultDateOption = isset($oConf->aConfig['dateFormat'])? $oConf->aConfig['dateFormat']: '';
|
||||
$defaultCasesListDateOption = isset($oConf->aConfig['casesListDateFormat'])? $oConf->aConfig['casesListDateFormat']: '';
|
||||
$defaultCasesListRowOption = isset($oConf->aConfig['casesListRowNumber']) ? $oConf->aConfig['casesListRowNumber'] : '';
|
||||
|
||||
// $translations = G::getTranslations(Array(
|
||||
// 'ID_PM_ENV_SETTINGS_TITLE', 'ID_PM_ENV_SETTINGS_USERFIELDSET_TITLE', 'IS_USER_NAME_DISPLAY_FORMAT', 'ID_SAVE_SETTINGS',
|
||||
// 'ID_LAN_UPDATE_DATE', 'ID_SAVING_ENVIRONMENT_SETTINGS', 'ID_ENVIRONMENT_SETTINGS_MSG_1',
|
||||
// 'ID_PM_ENV_SETTINGS_REGIONFIELDSET_TITLE', 'ID_GLOBAL_DATE_FORMAT', 'ID_PM_ENV_SETTINGS_CASESLIST_TITLE', 'ID_CASES_ROW_NUMBER', 'ID_CASES_DATE_MASK'
|
||||
// ));
|
||||
// $defaultOption = isset($oConf->aConfig['format'])? $oConf->aConfig['format']: '';
|
||||
// $defaultDateOption = isset($oConf->aConfig['dateFormat'])? $oConf->aConfig['dateFormat']: '';
|
||||
// $defaultCasesListDateOption = isset($oConf->aConfig['casesListDateFormat'])? $oConf->aConfig['casesListDateFormat']: '';
|
||||
// $defaultCasesListRowOption = isset($oConf->aConfig['casesListRowNumber']) ? $oConf->aConfig['casesListRowNumber'] : '';
|
||||
//
|
||||
$oHeadPublisher =& headPublisher::getSingleton();
|
||||
$oHeadPublisher->addExtJsScript('setup/environmentSettings', false );
|
||||
|
||||
$oHeadPublisher->assign('default_format', $defaultOption);
|
||||
$oHeadPublisher->assign('default_date_format', $defaultDateOption);
|
||||
$oHeadPublisher->assign('default_caseslist_date_format', $defaultCasesListDateOption);
|
||||
$oHeadPublisher->assign('default_caseslist_row_number', $defaultCasesListRowOption);
|
||||
|
||||
|
||||
|
||||
$oHeadPublisher->assign('dateFormatsList', Configurations::getDateFormats());
|
||||
|
||||
$oHeadPublisher->assign('TRANSLATIONS', $translations);
|
||||
// $oHeadPublisher->assign('default_format', $defaultOption);
|
||||
// $oHeadPublisher->assign('default_date_format', $defaultDateOption);
|
||||
// $oHeadPublisher->assign('default_caseslist_date_format', $defaultCasesListDateOption);
|
||||
// $oHeadPublisher->assign('default_caseslist_row_number', $defaultCasesListRowOption);
|
||||
//
|
||||
//
|
||||
//
|
||||
// $oHeadPublisher->assign('dateFormatsList', Configurations::getDateFormats());
|
||||
//
|
||||
// $oHeadPublisher->assign('TRANSLATIONS', $translations);
|
||||
$oHeadPublisher->assign('FORMATS',$c->getFormats());
|
||||
G::RenderPage('publish', 'extJs');
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user