diff --git a/module/custom/control.php b/module/custom/control.php index 107b253ff7..bd26fb1b40 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -354,11 +354,11 @@ class custom extends control * @return void */ public function estimate() - { + { $this->lang->custom->menu = new stdclass(); $this->lang->navGroup->custom = 'system'; if(strtolower($this->server->request_method) == "post") - { + { $data = fixer::input('post')->get(); $this->loadModel('setting')->setItem('system.custom.hourPoint', $data->hourPoint); $this->loadModel('setting')->setItem('system.custom.cost', $data->cost); @@ -368,11 +368,11 @@ class custom extends control if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('custom', 'estimate'))); - } + } $this->app->loadConfig('project'); - $this->view->unit = zget($this->config->custom, 'hourPoint', '1'); + $this->view->unit = zget($this->config->custom, 'hourPoint', '1'); $this->view->cost = zget($this->config->custom, 'cost', ''); $this->view->efficiency = zget($this->config->custom, 'efficiency', ''); $this->view->hours = zget($this->config->project, 'defaultWorkhours', ''); diff --git a/module/custom/model.php b/module/custom/model.php index 8b42b02f9e..d9be895175 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -362,7 +362,7 @@ class customModel extends model } /** - * Get system swapper. + * Get system swapper. * @param string $module * @param string $method * @access public @@ -370,8 +370,8 @@ class customModel extends model */ public function getSwapper() { - $current = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? 'scrum' : 'cmmi'; - $link = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? html::a(helper::createLink('custom', 'setcmmi'), 'CMMI') : html::a(helper::createLink('custom', 'setscrum'), 'SCRUM'); + $current = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? 'Scrum' : 'CMMI'; + $link = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? html::a(helper::createLink('custom', 'setcmmi'), 'CMMI') : html::a(helper::createLink('custom', 'setscrum'), 'Scrum'); $output = "
"; $output .= ""; diff --git a/module/group/lang/.resource.php.swp b/module/group/lang/.resource.php.swp deleted file mode 100644 index aa2ed87700..0000000000 Binary files a/module/group/lang/.resource.php.swp and /dev/null differ