diff --git a/framework/router.class.php b/framework/router.class.php index eeaa073339..b5542be763 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -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','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) { @@ -135,8 +135,15 @@ class router extends baseRouter 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') + { + $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; $config->storyCommon = $storyCommon; /* Set productCommon, projectCommon, storyCommon and hourCommon. Default english lang. */