diff --git a/framework/router.class.php b/framework/router.class.php index b74367ae70..39b2d94fdc 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -68,6 +68,7 @@ class router extends baseRouter } $productCommon = $projectCommon = 0; + if(!empty($this->config->isINT)) $projectCommon = 1; if($productProject) { $productProject = $productProject->value; diff --git a/module/action/model.php b/module/action/model.php index 9dfe977eb5..353c5adae1 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -342,6 +342,12 @@ class actionModel extends model } } } + elseif(($actionName == 'opened' or $actionName == 'managed') and $objectType == 'project') + { + $linkedProducts = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($action->extra)->fetchPairs('id', 'name'); + $action->extra = ''; + if($linkedProducts) $action->extra = sprintf($this->lang->project->action->extra, '' . join(', ', $linkedProducts) . ''); + } $action->history = isset($histories[$actionID]) ? $histories[$actionID] : array(); $actionName = strtolower($action->action); diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 0147853aff..45f488d98d 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -384,7 +384,7 @@ $('#module' + moduleID).closest('li').addClass('active'); if($('#query li.active').size() == 0) $.toggleQueryBox(true); - + $(function(){$('#bugForm').table();}) app->loadConfig('qa', '', false);?> diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php index d825b45823..2328b68d91 100644 --- a/module/custom/view/flow.html.php +++ b/module/custom/view/flow.html.php @@ -21,7 +21,7 @@ - custom->productProject) ? $config->custom->productProject : '0_0' ?> + custom->productProject) ? $config->custom->productProject : (empty($config->isINT) ? '0_0' : '0_1');?>
custom->select;?> custom->productProject->relation as $key => $value):?>

diff --git a/module/project/control.php b/module/project/control.php index ad9bc9aec2..878fe02b3b 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1053,7 +1053,7 @@ class project extends control $this->project->updateProducts($projectID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); - $this->loadModel('action')->create('project', $projectID, 'opened'); + $this->loadModel('action')->create('project', $projectID, 'opened', '', join(',', $_POST['products'])); $planID = reset($_POST['plans']); if(!empty($planID)) @@ -1711,7 +1711,7 @@ class project extends control * @access public * @return void */ - public function manageProducts($projectID, $from='') + public function manageProducts($projectID, $from = '') { /* use first project if projectID does not exist. */ if(!isset($this->projects[$projectID])) $projectID = key($this->projects); @@ -1723,6 +1723,8 @@ class project extends control $this->project->updateProducts($projectID); if(dao::isError()) die(js::error(dao::getError())); + + $this->loadModel('action')->create('project', $projectID, 'Managed', '', join(',', $_POST['products'])); die(js::locate($browseProjectLink)); } diff --git a/module/project/lang/en.php b/module/project/lang/en.php index cdc9289bc5..4b08b69411 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -246,6 +246,11 @@ $lang->project->withweekend = 'incl. Weekend'; $lang->project->interval = 'Intervals'; $lang->project->fixFirstWithLeft = 'Modify the left'; +$lang->project->action = new stdclass(); +$lang->project->action->opened = '$date, created by $actor .' . "\n"; +$lang->project->action->managed = '$date, managed by $actor .' . "\n"; +$lang->project->action->extra = 'The related products are %s.'; + /* 统计。*/ $lang->project->charts = new stdclass(); $lang->project->charts->burn = new stdclass(); diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index d8d86cc5e0..0c0341daba 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -246,6 +246,11 @@ $lang->project->withweekend = '显示周末'; $lang->project->interval = '间隔'; $lang->project->fixFirstWithLeft = '修改剩余工时'; +$lang->project->action = new stdclass(); +$lang->project->action->opened = '$date, 由 $actor 创建。$extra' . "\n"; +$lang->project->action->managed = '$date, 由 $actor 维护。$extra' . "\n"; +$lang->project->action->extra = '相关产品为 %s。'; + /* 统计。*/ $lang->project->charts = new stdclass(); $lang->project->charts->burn = new stdclass(); diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index ca07c26eef..f3865d485f 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -15,15 +15,17 @@ $jsRoot = $this->app->getWebRoot() . "js/"; include '../../common/view/datepicker.html.php'; include '../../common/view/chosen.html.php'; $formId = 'searchForm-' . uniqid(''); +$fieldWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-110px'; +$operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-100px'; ?>