diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index c38e8c7c10..cfeb6f2052 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -12,6 +12,7 @@ $lang->mainNav->execution = "{$lang->navIcons['execution']} {$lang->execution->c $lang->mainNav->kanban = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|"; $lang->mainNav->doc = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|"; $lang->mainNav->report = "{$lang->navIcons['report']} {$lang->report->common}|report|productSummary|"; +$lang->mainNav->kanban = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|"; $lang->mainNav->system = "{$lang->navIcons['system']} {$lang->system->common}|my|team|"; $lang->mainNav->admin = "{$lang->navIcons['admin']} {$lang->admin->common}|admin|index|"; @@ -28,6 +29,7 @@ if($config->edition != 'open') $lang->mainNav->menuOrder = array(); $lang->mainNav->menuOrder[5] = 'my'; $lang->mainNav->menuOrder[20] = 'project'; +$lang->mainNav->menuOrder[30] = 'kanban'; $lang->mainNav->menuOrder[35] = 'doc'; $lang->mainNav->menuOrder[45] = 'system'; $lang->mainNav->menuOrder[65] = 'admin'; diff --git a/extension/lite/custom/ext/config/lite.php b/extension/lite/custom/ext/config/lite.php index 27a39f044f..00f7290e18 100644 --- a/extension/lite/custom/ext/config/lite.php +++ b/extension/lite/custom/ext/config/lite.php @@ -5,3 +5,7 @@ $config->custom->requiredModules[20] = 'story'; $config->custom->requiredModules[35] = 'execution'; $config->custom->requiredModules[40] = 'task'; $config->custom->requiredModules[85] = 'user'; + +$config->custom->fieldList['execution']['create'] = 'desc'; +$config->custom->fieldList['execution']['edit'] = 'desc,PO,PM,QD,RD'; +$config->custom->fieldList['story']['create'] = 'module,pri,estimate,keywords'; diff --git a/extension/lite/custom/ext/lang/zh-cn/lite.php b/extension/lite/custom/ext/lang/zh-cn/lite.php index 631a33413a..0e6d7a8036 100644 --- a/extension/lite/custom/ext/lang/zh-cn/lite.php +++ b/extension/lite/custom/ext/lang/zh-cn/lite.php @@ -3,6 +3,8 @@ $lang->custom->execution = '看板'; $lang->custom->closedExecution = '已关闭' . $lang->custom->execution; $lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang->custom->execution}下的卡片、日志以及关联目标都禁止修改。"; +$lang->custom->moduleName['execution'] = $lang->custom->execution; + $lang->custom->object = array(); $lang->custom->object['project'] = '项目'; $lang->custom->object['execution'] = $lang->custom->execution; @@ -12,4 +14,15 @@ $lang->custom->object['todo'] = '待办'; $lang->custom->object['user'] = '用户'; $lang->custom->object['block'] = '区块'; +$lang->custom->task = new stdClass(); +$lang->custom->task->fields['priList'] = '优先级'; + +$lang->custom->story = new stdClass(); +$lang->custom->story->fields['priList'] = '优先级'; +$lang->custom->story->fields['reasonList'] = '关闭原因'; +$lang->custom->story->fields['statusList'] = '状态'; +$lang->custom->story->fields['reviewRules'] = '评审规则'; +$lang->custom->story->fields['reviewResultList'] = '评审结果'; +$lang->custom->story->fields['review'] = '评审流程'; + if($this->config->edition != 'open') $lang->custom->system = array('required', 'score'); diff --git a/extension/lite/datatable/ext/model/lite.php b/extension/lite/datatable/ext/model/lite.php new file mode 100644 index 0000000000..2e8b415aed --- /dev/null +++ b/extension/lite/datatable/ext/model/lite.php @@ -0,0 +1,36 @@ +config->$module)) $this->loadModel($module); + if($this->session->currentProductType === 'normal') unset($this->config->$module->datatable->fieldList['branch']); + foreach($this->config->$module->datatable->fieldList as $field => $items) + { + if($field === 'branch') + { + if($this->session->currentProductType === 'branch') $this->config->$module->datatable->fieldList[$field]['title'] = $this->lang->datatable->branch; if($this->session->currentProductType === 'platform') $this->config->$module->datatable->fieldList[$field]['title'] = $this->lang->datatable->platform; + continue; } + $title = zget($this->lang->$module, $items['title'], zget($this->lang, $items['title'], $items['title'])); + $this->config->$module->datatable->fieldList[$field]['title'] = $title; + } + + if($this->config->edition != 'open' and $module != 'story') + { + $fields = $this->loadModel('workflowfield')->getList($module); + foreach($fields as $field) + { + if($field->buildin) continue; + $this->config->$module->datatable->fieldList[$field->field]['title'] = $field->name; + $this->config->$module->datatable->fieldList[$field->field]['width'] = '120'; + $this->config->$module->datatable->fieldList[$field->field]['fixed'] = 'no'; + $this->config->$module->datatable->fieldList[$field->field]['required'] = 'no'; + } + } + return $this->config->$module->datatable->fieldList; +} diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php index d787b16335..42f4df2fc2 100644 --- a/extension/lite/group/ext/lang/resource.php +++ b/extension/lite/group/ext/lang/resource.php @@ -159,7 +159,6 @@ if($config->systemMode == 'new') $lang->resource->project->unbindWhitelist = 'unbindWhitelist'; $lang->resource->project->manageProducts = 'manageProducts'; $lang->resource->project->dynamic = 'dynamic'; - $lang->resource->project->build = 'build'; $lang->resource->project->qa = 'qa'; $lang->resource->project->bug = 'bug'; $lang->resource->project->testcase = 'testcase'; @@ -199,7 +198,6 @@ if($config->systemMode == 'new') $lang->project->methodOrder[120] = 'manageProducts'; $lang->project->methodOrder[125] = 'view'; $lang->project->methodOrder[130] = 'dynamic'; - $lang->project->methodOrder[135] = 'build'; $lang->project->methodOrder[140] = 'qa'; $lang->project->methodOrder[145] = 'bug'; $lang->project->methodOrder[150] = 'testcase'; @@ -212,11 +210,6 @@ if($config->systemMode == 'new') $lang->project->methodOrder[185] = 'team'; $lang->project->methodOrder[190] = 'unlinkMember'; - $lang->resource->projectbuild = new stdclass(); - $lang->resource->projectbuild->browse = 'browse'; - - $lang->projectbuild->methodOrder[5] = 'browse'; - /* Project Story. */ $lang->resource->projectstory = new stdclass(); $lang->resource->projectstory->story = 'story'; @@ -555,20 +548,6 @@ $lang->task->methodOrder[105] = 'deleteEstimate'; $lang->task->methodOrder[110] = 'report'; $lang->task->methodOrder[115] = 'batchChangeModule'; -$lang->resource->job = new stdclass(); -$lang->resource->job->browse = 'browseAction'; -$lang->resource->job->create = 'create'; -$lang->resource->job->edit = 'edit'; -$lang->resource->job->delete = 'delete'; -$lang->resource->job->exec = 'exec'; -$lang->resource->job->view = 'view'; - -$lang->job->methodOrder[5] = 'browse'; -$lang->job->methodOrder[10] = 'create'; -$lang->job->methodOrder[15] = 'edit'; -$lang->job->methodOrder[20] = 'delete'; -$lang->job->methodOrder[25] = 'exec'; - /* Doc. */ $lang->resource->doc = new stdclass(); $lang->resource->doc->index = 'index'; diff --git a/extension/lite/story/ext/config/lite.php b/extension/lite/story/ext/config/lite.php index 2c44805be7..0f3a2aef87 100644 --- a/extension/lite/story/ext/config/lite.php +++ b/extension/lite/story/ext/config/lite.php @@ -7,3 +7,15 @@ $config->story->list->exportFields = ' closedBy, closedDate, closedReason, lastEditedBy, lastEditedDate, childStories, linkStories, duplicateStory, files'; + +$config->story->datatable->defaultField = array('id', 'pri', 'title', 'openedBy', 'assignedTo', 'estimate', 'status', 'actions'); + +unset($config->story->datatable->fieldList['plan']); +unset($config->story->datatable->fieldList['source']); +unset($config->story->datatable->fieldList['sourceNote']); +unset($config->story->datatable->fieldList['stage']); +unset($config->story->datatable->fieldList['category']); +unset($config->story->datatable->fieldList['feedbackBy']); +unset($config->story->datatable->fieldList['notifyEmail']); +unset($config->story->datatable->fieldList['bugCount']); +unset($config->story->datatable->fieldList['caseCount']); diff --git a/extension/lite/story/ext/view/change.lite.html.hook.php b/extension/lite/story/ext/view/change.lite.html.hook.php new file mode 100644 index 0000000000..13d0ce6107 --- /dev/null +++ b/extension/lite/story/ext/view/change.lite.html.hook.php @@ -0,0 +1,4 @@ + diff --git a/extension/lite/story/ext/view/edit.html.php b/extension/lite/story/ext/view/edit.html.php index c6e261d927..77db321046 100644 --- a/extension/lite/story/ext/view/edit.html.php +++ b/extension/lite/story/ext/view/edit.html.php @@ -105,26 +105,6 @@ status);?> - status != 'draft' and $story->type == 'story'):?> - - story->stage;?> - - stages and $branchTagOption) - { - foreach($story->stages as $branch => $stage) - { - if(isset($branchTagOption[$branch])) echo '

' . $branchTagOption[$branch] . html::select("stages[$branch]", $lang->story->stageList, $stage, "class='form-control chosen'") . '

'; - } - } - else - { - echo html::select('stage', $lang->story->stageList, $story->stage, "class='form-control chosen'"); - } - ?> - - - story->pri;?> story->priList, $story->pri, "class='form-control chosen'");?> @@ -188,49 +168,6 @@ printExtendFields($story, 'div', 'position=right');?> -
-
story->legendMisc;?>
- - status == 'closed'):?> - - - - - - status == 'closed'):?> - - - - - - - - - -
story->duplicateStory;?>duplicateStory, "class='form-control'");?>
story->childStories;?> - createLink('story', 'linkStory', "storyID=$story->id&type=childStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> -
-
    - childStories) - { - $childStories = explode(',', $story->childStories); - foreach($childStories as $childStoryID) - { - if(isset($story->extraStories[$childStoryID])) - { - echo "
  • "; - echo ""; - echo ""; - echo '
    • '; - } - } - } - ?> - -
-
-
diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php index cb6a296bc2..d01e99d581 100644 --- a/extension/lite/story/ext/view/view.html.php +++ b/extension/lite/story/ext/view/view.html.php @@ -217,23 +217,6 @@ story->status;?> processStatus('story', $story);?> - type != 'requirement'):?> - - story->stage;?> - - stages and $branches) - { - foreach($story->stages as $branch => $stage) if(isset($branches[$branch])) echo $branches[$branch] . ' : ' . $lang->story->stageList[$stage] . '
'; - } - else - { - echo $lang->story->stageList[$story->stage]; - } - ?> - - - story->pri;?> pri;?>' title='story->priList, $story->pri)?>'>story->priList, $story->pri)?> diff --git a/extension/lite/todo/ext/view/calendar.html.php b/extension/lite/todo/ext/view/calendar.html.php index a10cc37e09..6560bd2feb 100644 --- a/extension/lite/todo/ext/view/calendar.html.php +++ b/extension/lite/todo/ext/view/calendar.html.php @@ -44,13 +44,11 @@