* finish task #7164.
This commit is contained in:
@@ -106,7 +106,7 @@ class router extends baseRouter
|
||||
$commonSettings = array();
|
||||
try
|
||||
{
|
||||
$commonSettings = $this->dbh->query('SELECT `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='custom' and `key` in ('productProject','urAndSr','urSrName','storyRequirement','hourPoint')")->fetchAll();
|
||||
$commonSettings = $this->dbh->query('SELECT `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='custom' and `key` in ('productProject','URAndSR','URSRName','storyRequirement','hourPoint')")->fetchAll();
|
||||
}
|
||||
catch (PDOException $exception)
|
||||
{
|
||||
@@ -134,16 +134,16 @@ class router extends baseRouter
|
||||
if($setting->key == 'productProject') list($productCommon, $projectCommon) = explode('_', $setting->value);
|
||||
if($setting->key == 'storyRequirement') $storyCommon = $setting->value;
|
||||
if($setting->key == 'hourPoint') $hourCommon = $setting->value;
|
||||
if($setting->key == 'urAndSr') $config->urAndSr = $setting->value;
|
||||
if($setting->key == 'urSrName')
|
||||
if($setting->key == 'URAndSR') $config->URAndSR = $setting->value;
|
||||
if($setting->key == 'URSRName')
|
||||
{
|
||||
$urSrName = json_decode($setting->value, true);
|
||||
if(isset($urSrName['urCommon'][$this->clientLang])) $config->urCommon = $urSrName['urCommon'][$this->clientLang];
|
||||
if(isset($urSrName['srCommon'][$this->clientLang])) $config->srCommon = $urSrName['srCommon'][$this->clientLang];
|
||||
$URSRName = json_decode($setting->value, true);
|
||||
if(isset($URSRName['urCommon'][$this->clientLang])) $config->urCommon = $URSRName['urCommon'][$this->clientLang];
|
||||
if(isset($URSRName['srCommon'][$this->clientLang])) $config->srCommon = $URSRName['srCommon'][$this->clientLang];
|
||||
}
|
||||
}
|
||||
|
||||
if(!empty($config->urAndSr)) $storyCommon = 0;
|
||||
if(!empty($config->URAndSR)) $storyCommon = 0;
|
||||
$config->storyCommon = $storyCommon;
|
||||
|
||||
/* Set productCommon, projectCommon, storyCommon and hourCommon. Default english lang. */
|
||||
|
||||
Reference in New Issue
Block a user