From b59ac8b1a0dc196a4391095a814aa9df3ae4bc6b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 26 Apr 2018 11:25:40 +0800 Subject: [PATCH 1/7] * finish task #3915,3917,3955. --- module/common/lang/menuOrder.php | 18 ++++++---------- module/common/lang/zh-cn.php | 37 +++++++++++++++++++++++++------- module/common/model.php | 26 +++++++++++----------- module/custom/model.php | 34 ++++++++++++++--------------- module/project/css/burn.css | 4 ---- module/project/model.php | 36 ++++++++++++++++++++++++++++--- 6 files changed, 97 insertions(+), 58 deletions(-) diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 1c53de9cea..342ecd1dac 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -48,19 +48,15 @@ $lang->branch->menuOrder = $lang->product->menuOrder; /* project menu order. */ $lang->project->menuOrder[5] = 'list'; -$lang->project->menuOrder[10] = 'index'; -$lang->project->menuOrder[15] = 'task'; +$lang->project->menuOrder[10] = 'kanban'; +$lang->project->menuOrder[15] = 'burn'; $lang->project->menuOrder[20] = 'story'; -$lang->project->menuOrder[25] = 'bug'; -$lang->project->menuOrder[30] = 'build'; -$lang->project->menuOrder[35] = 'testtask'; +$lang->project->menuOrder[25] = 'qa'; +$lang->project->menuOrder[30] = 'doc'; +$lang->project->menuOrder[35] = 'action'; $lang->project->menuOrder[40] = 'team'; -$lang->project->menuOrder[45] = 'dynamic'; -$lang->project->menuOrder[50] = 'doc'; -$lang->project->menuOrder[55] = 'product'; -$lang->project->menuOrder[60] = 'view'; -$lang->project->menuOrder[65] = 'create'; -$lang->project->menuOrder[70] = 'all'; +$lang->project->menuOrder[45] = 'product'; +$lang->project->menuOrder[50] = 'view'; $lang->task->menuOrder = $lang->project->menuOrder; $lang->build->menuOrder = $lang->project->menuOrder; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index bc5832a81f..613a7b73ff 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -221,21 +221,42 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->task = array('link' => '任务|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); +$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,importbug,tree'); +$lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s'); +$lang->project->menu->burn = array('link' => '燃尽图|project|burn|projectID=%s'); $lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; -$lang->project->menu->dynamic = '动态|project|dynamic|projectID=%s'; -$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); -$lang->project->menu->testtask = array('link' => '测试单|project|testtask|projectID=%s'); -$lang->project->menu->team = array('link' => '团队|project|team|projectID=%s', 'alias' => 'managemembers'); +$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'build'); $lang->project->menu->doc = array('link' => '文档|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); +$lang->project->menu->action = array('link' => '%s'); $lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; +$lang->project->menu->team = array('link' => '团队|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->view = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); +$lang->project->subMenu = new stdclass(); +$lang->project->subMenu->list = new stdclass(); +$lang->project->subMenu->list->task = '任务列表|project|task|projectID=%s'; +$lang->project->subMenu->list->tree = '树状图|project|tree|projectID=%s'; +$lang->project->subMenu->list->groupTask = '分组视图|project|groupTask|projectID=%s'; + +$lang->project->subMenu->qa = new stdclass(); +$lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s'; +$lang->project->subMenu->qa->build = '版本|project|build|projectID=%s'; +$lang->project->subMenu->qa->testtask = '测试单|project|testtask|projectID=%s'; + +$lang->project->subMenu->action = new stdclass(); +$lang->project->subMenu->action->dynamic = '动态|project|dynamic|projectID=%s'; + +$lang->project->dividerMenu = ',story,doc,'; + $lang->task = new stdclass(); $lang->build = new stdclass(); -$lang->task->menu = $lang->project->menu; -$lang->build->menu = $lang->project->menu; +$lang->task->menu = $lang->project->menu; +$lang->task->subMenu = $lang->project->subMenu; +$lang->build->menu = $lang->project->menu; +$lang->build->subMenu = $lang->project->subMenu; + +$lang->task->dividerMenu = $lang->project->dividerMenu; +$lang->build->dividerMenu = $lang->project->dividerMenu; /* QA视图菜单设置。*/ $lang->qa = new stdclass(); diff --git a/module/common/model.php b/module/common/model.php index 60fe2fb5ee..23a92a32f7 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -456,40 +456,38 @@ class commonModel extends model /* Cycling to print every sub menus. */ foreach($menu as $menuItem) { + if(isset($lang->$moduleName->dividerMenu) and strpos($lang->$moduleName->dividerMenu, ",{$menuItem->name},") !== false) echo "
  • "; if(isset($menuItem->hidden) && $menuItem->hidden) continue; if($isMobile and empty($menuItem->link)) continue; /* Init the these vars. */ + $alias = isset($menuItem->alias) ? $menuItem->alias : ''; + $subModule = isset($menuItem->subModule) ? explode(',', $menuItem->subModule) : array(); + $class = isset($menuItem->class) ? $menuItem->class : ''; + $active = ''; + if($subModule and in_array($currentModule, $subModule)) $active = 'active'; + if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active'; if($menuItem->link) { - $active = ''; - $float = isset($menuItem->float) ? $menuItem->float : ''; - $alias = ''; $target = ''; $module = ''; $method = ''; $link = commonModel::createMenuLink($menuItem); if(is_array($menuItem->link)) { - if(isset($menuItem->link['subModule'])) - { - $subModules = explode(',', $menuItem->link['subModule']); - if(in_array($currentModule, $subModules) and $float != 'right') $active = 'active'; - } - if(isset($menuItem->link['alias'])) $alias = $menuItem->link['alias']; if(isset($menuItem->link['target'])) $target = $menuItem->link['target']; if(isset($menuItem->link['module'])) $module = $menuItem->link['module']; if(isset($menuItem->link['method'])) $method = $menuItem->link['method']; } - if($float != 'right' and $module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false)) $active = 'active'; + if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false)) $active = 'active'; - $menuItemHtml = "
  • " . html::a($link, $menuItem->text, $target) . "
  • \n"; - if($isMobile) $menuItemHtml = html::a($link, $menuItem->text, $target, "class='$active'") . "\n"; + $menuItemHtml = "
  • " . html::a($link, $menuItem->text, $target) . "
  • \n"; + if($isMobile) $menuItemHtml = html::a($link, $menuItem->text, $target, "class='$class $active'") . "\n"; echo $menuItemHtml; } else { - echo $isMobile ? $menuItem->text : "
  • $menuItem->text
  • \n"; + echo $isMobile ? $menuItem->text : "
  • $menuItem->text
  • \n"; } } echo $isMobile ? '' : "\n"; @@ -1290,7 +1288,7 @@ EOD; if(!empty($app->user->admin)) return true; if($module == 'todo' and ($method == 'create' or $method == 'batchcreate')) return true; - if($module == 'effort' and $method == 'batchcreate') return true; + if($module == 'effort' and ($method == 'batchcreate' or $method == 'createforobject')) return true; // limited project $limitedProject = false; diff --git a/module/custom/model.php b/module/custom/model.php index 8a48482aaa..358b27fa52 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -209,11 +209,12 @@ class customModel extends model { if(is_object($item)) $item = (array)$item; - $label = ''; - $module = ''; - $method = ''; - $float = ''; - $fixed = ''; + $label = ''; + $module = ''; + $method = ''; + $class = ''; + $subModule = ''; + $alias = ''; $link = (is_array($item) and isset($item['link'])) ? $item['link'] : $item; /* The variable of item has not link and is not link then ignore it. */ @@ -235,31 +236,28 @@ class customModel extends model { $itemLink = array('module' => $module, 'method' => $method); if(isset($link[3])) $itemLink['vars'] = $link[3]; - if(is_array($item)) - { - if(isset($item['subModule'])) $itemLink['subModule'] = $item['subModule']; - if(isset($item['alias'])) $itemLink['alias'] = $item['alias']; - if(isset($item['target'])) $itemLink['target'] = $item['target']; - } + if(is_array($item) and isset($item['target'])) $itemLink['target'] = $item['target']; } if(is_array($item)) { - if(isset($item['float'])) $float = $item['float']; - if(isset($item['fixed'])) $fixed = $item['fixed']; + if(isset($item['class'])) $class = $item['class']; + if(isset($item['subModule'])) $subModule = $item['subModule']; + if(isset($item['alias'])) $alias = $item['alias']; } - $hidden = !$fixed && isset($customMenuMap[$name]) && isset($customMenuMap[$name]->hidden) && $customMenuMap[$name]->hidden; + $hidden = isset($customMenuMap[$name]) && isset($customMenuMap[$name]->hidden) && $customMenuMap[$name]->hidden; if(strpos($name, 'QUERY') === 0 and !isset($customMenuMap[$name])) $hidden = true; $menuItem = new stdclass(); $menuItem->name = $name; $menuItem->link = $itemLink; $menuItem->text = $label; - $menuItem->order = $fixed ? -1 : (isset($customMenuMap[$name]) && isset($customMenuMap[$name]->order) ? $customMenuMap[$name]->order : $order++); - if($float) $menuItem->float = $float; - if($fixed) $menuItem->fixed = $fixed; - if($hidden) $menuItem->hidden = $hidden; + $menuItem->order = (isset($customMenuMap[$name]) && isset($customMenuMap[$name]->order) ? $customMenuMap[$name]->order : $order++); + if($hidden) $menuItem->hidden = $hidden; + if($class) $menuItem->class = $class; + if($subModule)$menuItem->subModule = $subModule; + if($alias) $menuItem->alias = $alias; if($isTutorialMode) $menuItem->tutorial = true; /* Hidden menu by config in mobile. */ diff --git a/module/project/css/burn.css b/module/project/css/burn.css index 71404cdc9f..8f8e93dccf 100644 --- a/module/project/css/burn.css +++ b/module/project/css/burn.css @@ -1,7 +1,3 @@ -.container {max-width: 950px!important;} -.container .actions {margin-bottom: 10px; padding: 0} -.container .actions > .text {padding: 5px 5px 5px 15px; line-height: 20px} .mw-220px {max-width: 220px!important} -#wrap h1{font-size:14px;} #interval{margin-right:10px;} .canvas-wrapper {padding: 15px; border: 1px solid #ddd;} diff --git a/module/project/model.php b/module/project/model.php index b353612eb1..c15a5e7127 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -78,9 +78,9 @@ class projectModel extends model if($project and $project->type == 'ops') { unset($this->lang->project->menu->story); - unset($this->lang->project->menu->bug); - unset($this->lang->project->menu->build); - unset($this->lang->project->menu->testtask); + unset($this->lang->project->subMenu->qa->bug); + unset($this->lang->project->subMenu->qa->build); + unset($this->lang->project->subMenu->qa->testtask); } if($projects and !isset($projects[$projectID]) and !$this->checkPriv($project)) @@ -118,6 +118,36 @@ class projectModel extends model foreach($this->lang->project->menu as $key => $menu) { $replace = $projectID; + + /* Replace for dropdown submenu. */ + if(isset($this->lang->project->subMenu->$key)) + { + $dropTitle = ''; + $hasActive = false; + $replace = "'; + $replace = "$dropTitle " . $replace; + + $this->lang->project->menu->$key['class'] = 'dropdown'; + if($hasActive) $this->lang->project->menu->$key['class'] .= ' active'; + } common::setMenuVars($this->lang->project->menu, $key, $replace); } } From 9450ca5676d76ebbe45bc4abde8ead5c265e6cbb Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 26 Apr 2018 15:58:03 +0800 Subject: [PATCH 2/7] * Refact detail page of productplan and build. --- module/build/css/view.css | 9 +- module/build/js/view.js | 5 +- module/build/lang/en.php | 61 +- module/build/lang/zh-cn.php | 61 +- module/build/view/linkbug.html.php | 89 +- module/build/view/linkstory.html.php | 76 +- module/build/view/view.html.php | 451 +- module/file/view/printfiles.html.php | 5 +- module/productplan/css/view.css | 4 +- module/productplan/js/view.js | 3 +- module/productplan/lang/en.php | 2 +- module/productplan/lang/zh-cn.php | 2 +- module/productplan/view/browse.html.php | 2 +- module/productplan/view/linkbug.html.php | 81 +- module/productplan/view/linkstory.html.php | 65 +- module/productplan/view/view.html.php | 753 +- module/project/view/build.html.php | 5 +- module/release/view/view.html.php | 206 +- www/js/zui/min.js | 14465 ++++++++++++++++++- 19 files changed, 15408 insertions(+), 937 deletions(-) diff --git a/module/build/css/view.css b/module/build/css/view.css index 7d36be4c67..fe02757627 100644 --- a/module/build/css/view.css +++ b/module/build/css/view.css @@ -1,16 +1,15 @@ .tabs {position:relative;} - -.tabs .nav-tabs{border-bottom:none;} .tabs .nav-tabs>li{margin-bottom:0px;} - .tabs .tab-content {padding: 0; border: none;} .tabs .tab-content .tab-pane .action {position: absolute; right: 0; top: -1px;} .tabs .tab-content .tab-pane #querybox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;} .tabs .tab-content .tab-pane #querybox form {padding-left:0px;} -.table-actions {padding-left: 5px;} +#unlinkStoryList, #unlinkBugList{border:1px solid #ddd;} + +.table-footer .text {line-height: 30px;} +.table-footer .table-actions {margin-right: 10px;} -#buildInfo {border-top: 1px solid #ddd;} #buildInfo > div {padding-top: 15px;} #querybox form {margin: 0px !important;} diff --git a/module/build/js/view.js b/module/build/js/view.js index bb88ba4864..5f8a510b82 100644 --- a/module/build/js/view.js +++ b/module/build/js/view.js @@ -5,11 +5,12 @@ function showLink(buildID, type, param) { var obj = type == 'story' ? '.tab-pane#stories .linkBox' : '.tab-pane#bugs .linkBox'; $(obj).html(data); - $('#' + type + 'List').hide(); + $('#' + type + 'List').closest('form').hide(); var formID = type == 'story' ? '#unlinkedStoriesForm' : '#unlinkedBugsForm'; setTimeout(function(){fixedTfootAction(formID)}, 100); - checkTable($(formID).find('table')); + + $('[data-ride="table"]').table(); }); } $(function() diff --git a/module/build/lang/en.php b/module/build/lang/en.php index f5d21f084b..4f0d263c1c 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -9,17 +9,17 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->build->common = "Build"; -$lang->build->create = "Create Build"; -$lang->build->edit = "Edit"; -$lang->build->linkStory = "Link Story"; -$lang->build->linkBug = "Link Bug"; -$lang->build->delete = "Delete Build"; -$lang->build->deleted = "Deleted"; -$lang->build->view = "Build Details"; -$lang->build->batchUnlink = 'Batch Unlink'; -$lang->build->batchUnlinkStory = 'Batch Story Unlink'; -$lang->build->batchUnlinkBug = 'Batch Bug Unlink'; +$lang->build->common = "Build"; +$lang->build->create = "Create Build"; +$lang->build->edit = "Edit"; +$lang->build->linkStory = "Link Story"; +$lang->build->linkBug = "Link Bug"; +$lang->build->delete = "Delete Build"; +$lang->build->deleted = "Deleted"; +$lang->build->view = "Build Details"; +$lang->build->batchUnlink = 'Batch Unlink'; +$lang->build->batchUnlinkStory = 'Batch Story Unlink'; +$lang->build->batchUnlinkBug = 'Batch Bug Unlink'; $lang->build->confirmDelete = "Do you want to delete this Build?"; $lang->build->confirmUnlinkStory = "Do you want to unlink this Story?"; @@ -27,25 +27,26 @@ $lang->build->confirmUnlinkBug = "Do you want to unlink this Bug?"; $lang->build->basicInfo = 'Basic Info'; -$lang->build->id = 'ID'; -$lang->build->product = $lang->productCommon; -$lang->build->branch = 'Platform/Branch'; -$lang->build->project = $lang->projectCommon; -$lang->build->name = 'Name'; -$lang->build->date = 'Date'; -$lang->build->builder = 'Builder'; -$lang->build->scmPath = 'SCM Path'; -$lang->build->filePath = 'File Path'; -$lang->build->desc = 'Description'; -$lang->build->files = 'Upload Files'; -$lang->build->last = 'Last Build'; -$lang->build->packageType = 'Package Type'; -$lang->build->unlinkStory = 'Unlink Story'; -$lang->build->unlinkBug = 'Unlink Bug'; -$lang->build->stories = 'Finished Story'; -$lang->build->bugs = 'Resolved Bug'; -$lang->build->generatedBugs = 'Left Bug'; -$lang->build->noProduct = " This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first link {$lang->productCommon}"; +$lang->build->id = 'ID'; +$lang->build->product = $lang->productCommon; +$lang->build->branch = 'Platform/Branch'; +$lang->build->project = $lang->projectCommon; +$lang->build->name = 'Name'; +$lang->build->date = 'Date'; +$lang->build->builder = 'Builder'; +$lang->build->scmPath = 'SCM Path'; +$lang->build->filePath = 'File Path'; +$lang->build->desc = 'Description'; +$lang->build->files = 'Upload Files'; +$lang->build->last = 'Last Build'; +$lang->build->packageType = 'Package Type'; +$lang->build->unlinkStory = 'Unlink Story'; +$lang->build->unlinkBug = 'Unlink Bug'; +$lang->build->stories = 'Finished Story'; +$lang->build->bugs = 'Resolved Bug'; +$lang->build->generatedBugs = 'Left Bug'; +$lang->build->noProduct = " This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first link {$lang->productCommon}"; +$lang->build->noData = 'No data'; $lang->build->finishStories = ' %s Story(ies) have been finished.'; $lang->build->resolvedBugs = ' %s Bug(s) have been resolved.'; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index bc941c457d..7c59ae1064 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -9,17 +9,17 @@ * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->build->common = "版本"; -$lang->build->create = "创建版本"; -$lang->build->edit = "编辑版本"; -$lang->build->linkStory = "关联需求"; -$lang->build->linkBug = "关联Bug"; -$lang->build->delete = "删除版本"; -$lang->build->deleted = "已删除"; -$lang->build->view = "版本详情"; -$lang->build->batchUnlink = '批量移除'; -$lang->build->batchUnlinkStory = '批量移除需求'; -$lang->build->batchUnlinkBug = '批量移除Bug'; +$lang->build->common = "版本"; +$lang->build->create = "创建版本"; +$lang->build->edit = "编辑版本"; +$lang->build->linkStory = "关联需求"; +$lang->build->linkBug = "关联Bug"; +$lang->build->delete = "删除版本"; +$lang->build->deleted = "已删除"; +$lang->build->view = "版本详情"; +$lang->build->batchUnlink = '批量移除'; +$lang->build->batchUnlinkStory = '批量移除需求'; +$lang->build->batchUnlinkBug = '批量移除Bug'; $lang->build->confirmDelete = "您确认删除该版本吗?"; $lang->build->confirmUnlinkStory = "您确认移除该需求吗?"; @@ -27,25 +27,26 @@ $lang->build->confirmUnlinkBug = "您确认移除该Bug吗?"; $lang->build->basicInfo = '基本信息'; -$lang->build->id = 'ID'; -$lang->build->product = $lang->productCommon; -$lang->build->branch = '平台/分支'; -$lang->build->project = '所属' . $lang->projectCommon; -$lang->build->name = '名称编号'; -$lang->build->date = '打包日期'; -$lang->build->builder = '构建者'; -$lang->build->scmPath = '源代码地址'; -$lang->build->filePath = '下载地址'; -$lang->build->desc = '描述'; -$lang->build->files = '上传发行包'; -$lang->build->last = '上个版本'; -$lang->build->packageType = '包类型'; -$lang->build->unlinkStory = '移除需求'; -$lang->build->unlinkBug = '移除Bug'; -$lang->build->stories = '完成的需求'; -$lang->build->bugs = '解决的Bug'; -$lang->build->generatedBugs = '产生的Bug'; -$lang->build->noProduct = " 该{$lang->projectCommon}没有关联{$lang->productCommon},无法创建版本,请先关联{$lang->productCommon}"; +$lang->build->id = 'ID'; +$lang->build->product = $lang->productCommon; +$lang->build->branch = '平台/分支'; +$lang->build->project = '所属' . $lang->projectCommon; +$lang->build->name = '名称编号'; +$lang->build->date = '打包日期'; +$lang->build->builder = '构建者'; +$lang->build->scmPath = '源代码地址'; +$lang->build->filePath = '下载地址'; +$lang->build->desc = '描述'; +$lang->build->files = '上传发行包'; +$lang->build->last = '上个版本'; +$lang->build->packageType = '包类型'; +$lang->build->unlinkStory = '移除需求'; +$lang->build->unlinkBug = '移除Bug'; +$lang->build->stories = '完成的需求'; +$lang->build->bugs = '解决的Bug'; +$lang->build->generatedBugs = '产生的Bug'; +$lang->build->noProduct = " 该{$lang->projectCommon}没有关联{$lang->productCommon},无法创建版本,请先关联{$lang->productCommon}"; +$lang->build->noData = '暂无'; $lang->build->finishStories = ' 本次共完成 %s 个需求'; $lang->build->resolvedBugs = ' 本次共解决 %s 个Bug'; diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index 299881388e..bb1c0b7d84 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -10,57 +10,58 @@ * @link http://www.zentao.net */ ?> -app->getWebRoot() . "js/"; -include '../../common/view/tablesorter.html.php'; -?>
    -
    id}&browseType=$browseType¶m=$param");?>'> - - + id}&browseType=$browseType¶m=$param");?>'> +
    +
     productplan->unlinkedBugs;?>
    +
    +
     productplan->unlinkedBugs;?>
    - - - - - - - - + + + + + + + + - - bugs},", ",$bug->id,") !== false) continue;?> - product != $bug->product) continue; ?> - - - - - - - - - + + + bugs},", ",$bug->id,") !== false) continue;?> + product != $bug->product) continue; ?> + + + + + + + + + + - - - - -
    idAB;?> priAB;?> bug->title;?> openedByAB;?> bug->resolvedBy;?> statusAB;?>
    + +
    + +
    + + idAB;?> +
    priAB;?> bug->title;?> openedByAB;?>bug->resolvedBy;?> statusAB;?>
    - status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> - createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?> - bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?>createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?>openedBy];?>status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?>bug->statusList[$bug->status];?>
    + id => sprintf('%03d', $bug->id)), ($bug->status == 'resolved' or $bug->status == 'closed') ? $story->id : '');?> + bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?>createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?>openedBy];?>status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?>bug->statusList[$bug->status];?>
    - "; - echo html::selectButton() . html::submitButton($lang->build->linkBug); - echo html::a(inlink('view', "buildID={$build->id}&type=bug"), $lang->goback, '', "class='btn'"); - echo ''; - } - ?> -
    +
    diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index a37f48bc60..a71a672ca3 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -12,14 +12,19 @@ ?>
    -
    id&browseType=$browseType¶m=$param")?>'> + id&browseType=$browseType¶m=$param")?>' data-ride='table'>
     productplan->unlinkedStories;?>
    - + @@ -36,8 +41,11 @@ product != $story->product) continue; ?> @@ -50,21 +58,18 @@ - - - - - - -
    idAB;?> +
    + +
    + idAB;?> +
    priAB;?> story->title;?> openedByAB;?>
    - stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> - id);?> +
    + stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> + +
    + id);?>
    pri;?>'>story->priList, $story->pri)?> createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?>
    + + +
    From dc7f7362a26d993a9803e114a2d19ce2068bfafd Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 26 Apr 2018 16:11:17 +0800 Subject: [PATCH 4/7] * Optimize codes. --- module/release/js/view.js | 3 +- module/release/lang/en.php | 60 +++++++++++++------------- module/release/lang/zh-cn.php | 60 +++++++++++++------------- module/release/view/linkbug.html.php | 21 ++++----- module/release/view/linkstory.html.php | 13 +++--- 5 files changed, 77 insertions(+), 80 deletions(-) diff --git a/module/release/js/view.js b/module/release/js/view.js index bc98ca25c3..db4e8df12f 100644 --- a/module/release/js/view.js +++ b/module/release/js/view.js @@ -11,7 +11,8 @@ function showLink(releaseID, type, param) var formID = type == 'story' ? '#unlinkedStoriesForm' : (type == 'leftBug' ? '#unlinkedLeftBugsForm' : '#unlinkedBugsForm'); setTimeout(function(){fixedTfootAction(formID)}, 100); - checkTable($(formID).find('table')); + + $('[data-ride="table"]').table(); }); } $(function() diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 99c0701d6a..90c6bec314 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -9,15 +9,15 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = 'Release'; -$lang->release->create = "Create"; -$lang->release->edit = "Edit"; -$lang->release->linkStory = "Link Story"; -$lang->release->linkBug = "Link Bug"; -$lang->release->delete = "Delete"; -$lang->release->deleted = 'Deleted'; -$lang->release->view = "Overview"; -$lang->release->browse = "Browse"; +$lang->release->common = 'Release'; +$lang->release->create = "Create"; +$lang->release->edit = "Edit"; +$lang->release->linkStory = "Link Story"; +$lang->release->linkBug = "Link Bug"; +$lang->release->delete = "Delete"; +$lang->release->deleted = 'Deleted'; +$lang->release->view = "Overview"; +$lang->release->browse = "Browse"; $lang->release->changeStatus = "Change Status"; $lang->release->batchUnlink = "Batch Unlink"; $lang->release->batchUnlinkStory = "Batch Unlink Story"; @@ -29,27 +29,27 @@ $lang->release->confirmUnlinkBug = "Do you want to remove this Bug?"; $lang->release->basicInfo = 'Basic Info'; -$lang->release->id = 'ID'; -$lang->release->product = $lang->productCommon; -$lang->release->branch = 'Platform/Branch'; -$lang->release->build = 'Build'; -$lang->release->name = 'Name'; -$lang->release->marker = 'Marker'; -$lang->release->date = 'Date'; -$lang->release->desc = 'Description'; -$lang->release->status = 'Status'; -$lang->release->last = 'Last Release'; -$lang->release->unlinkStory = 'Unlink Story'; -$lang->release->unlinkBug = 'Unlink Bug'; -$lang->release->stories = 'Finished Story'; -$lang->release->bugs = 'Solved Bug'; -$lang->release->leftBugs = 'Remained Bug'; -$lang->release->generatedBugs = 'Remained Bug'; -$lang->release->finishStories = 'Finished %s Story'; -$lang->release->resolvedBugs = 'Solved %s Bug'; -$lang->release->createdBugs = 'Generated %s Bug'; -$lang->release->export = 'Export as HTML'; -$lang->release->yesterday = 'Released Yesterday'; +$lang->release->id = 'ID'; +$lang->release->product = $lang->productCommon; +$lang->release->branch = 'Platform/Branch'; +$lang->release->build = 'Build'; +$lang->release->name = 'Name'; +$lang->release->marker = 'Marker'; +$lang->release->date = 'Date'; +$lang->release->desc = 'Description'; +$lang->release->status = 'Status'; +$lang->release->last = 'Last Release'; +$lang->release->unlinkStory = 'Unlink Story'; +$lang->release->unlinkBug = 'Unlink Bug'; +$lang->release->stories = 'Finished Story'; +$lang->release->bugs = 'Solved Bug'; +$lang->release->leftBugs = 'Remained Bug'; +$lang->release->generatedBugs = 'Remained Bug'; +$lang->release->finishStories = 'Finished %s Story'; +$lang->release->resolvedBugs = 'Solved %s Bug'; +$lang->release->createdBugs = 'Generated %s Bug'; +$lang->release->export = 'Export as HTML'; +$lang->release->yesterday = 'Released Yesterday'; $lang->release->filePath = 'Download : '; $lang->release->scmPath = 'SCM Path : '; diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index 89cee4428d..572e89651a 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -9,15 +9,15 @@ * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = '发布'; -$lang->release->create = "创建发布"; -$lang->release->edit = "编辑发布"; -$lang->release->linkStory = "关联需求"; -$lang->release->linkBug = "关联Bug"; -$lang->release->delete = "删除发布"; -$lang->release->deleted = '已删除'; -$lang->release->view = "发布详情"; -$lang->release->browse = "浏览发布"; +$lang->release->common = '发布'; +$lang->release->create = "创建发布"; +$lang->release->edit = "编辑发布"; +$lang->release->linkStory = "关联需求"; +$lang->release->linkBug = "关联Bug"; +$lang->release->delete = "删除发布"; +$lang->release->deleted = '已删除'; +$lang->release->view = "发布详情"; +$lang->release->browse = "浏览发布"; $lang->release->changeStatus = "修改状态"; $lang->release->batchUnlink = "批量移除"; $lang->release->batchUnlinkStory = "批量移除需求"; @@ -29,27 +29,27 @@ $lang->release->confirmUnlinkBug = "您确认移除该Bug吗?"; $lang->release->basicInfo = '基本信息'; -$lang->release->id = 'ID'; -$lang->release->product = $lang->productCommon; -$lang->release->branch = '平台/分支'; -$lang->release->build = '版本'; -$lang->release->name = '发布名称'; -$lang->release->marker = '里程碑'; -$lang->release->date = '发布日期'; -$lang->release->desc = '描述'; -$lang->release->status = '状态'; -$lang->release->last = '上次发布'; -$lang->release->unlinkStory = '移除需求'; -$lang->release->unlinkBug = '移除Bug'; -$lang->release->stories = '完成的需求'; -$lang->release->bugs = '解决的Bug'; -$lang->release->leftBugs = '遗留的Bug'; -$lang->release->generatedBugs = '遗留的Bug'; -$lang->release->finishStories = '本次共完成 %s 个需求'; -$lang->release->resolvedBugs = '本次共解决 %s 个Bug'; -$lang->release->createdBugs = '本次共遗留 %s 个Bug'; -$lang->release->export = '导出HTML'; -$lang->release->yesterday = '昨日发布'; +$lang->release->id = 'ID'; +$lang->release->product = $lang->productCommon; +$lang->release->branch = '平台/分支'; +$lang->release->build = '版本'; +$lang->release->name = '发布名称'; +$lang->release->marker = '里程碑'; +$lang->release->date = '发布日期'; +$lang->release->desc = '描述'; +$lang->release->status = '状态'; +$lang->release->last = '上次发布'; +$lang->release->unlinkStory = '移除需求'; +$lang->release->unlinkBug = '移除Bug'; +$lang->release->stories = '完成的需求'; +$lang->release->bugs = '解决的Bug'; +$lang->release->leftBugs = '遗留的Bug'; +$lang->release->generatedBugs = '遗留的Bug'; +$lang->release->finishStories = '本次共完成 %s 个需求'; +$lang->release->resolvedBugs = '本次共解决 %s 个Bug'; +$lang->release->createdBugs = '本次共遗留 %s 个Bug'; +$lang->release->export = '导出HTML'; +$lang->release->yesterday = '昨日发布'; $lang->release->filePath = '下载地址:'; $lang->release->scmPath = '版本库地址:'; diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php index b0ccc99b56..2f56ce571a 100644 --- a/module/release/view/linkbug.html.php +++ b/module/release/view/linkbug.html.php @@ -24,16 +24,18 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; +
    + idAB;?> priAB;?> bug->title;?> - openedByAB;?> - bug->resolvedBy;?> - statusAB;?> + openedByAB;?> + bug->resolvedBy;?> + statusAB;?> @@ -42,11 +44,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; id,") !== false) continue;?> -
    - status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> - -
    - createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?> + id => sprintf('%03d', $bug->id)), ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bud->id : '');?> bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> @@ -58,15 +56,15 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; - - diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index a71a672ca3..007604a022 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -20,9 +20,11 @@ +
    + idAB;?> priAB;?> @@ -59,17 +61,15 @@ - - From 50336ef7621471c65fd9bfd23dad220ac9d7be47 Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 26 Apr 2018 17:09:02 +0800 Subject: [PATCH 5/7] * Refact bug page of project. --- module/block/lang/zh-tw.php | 38 ++++++++++----- module/bug/lang/en.php | 23 ++++----- module/bug/lang/zh-cn.php | 23 ++++----- module/bug/lang/zh-tw.php | 23 ++++----- module/build/lang/zh-tw.php | 61 ++++++++++++------------ module/build/view/view.html.php | 8 +++- module/common/lang/zh-tw.php | 39 ++++++++++++---- module/extension/lang/zh-tw.php | 4 +- module/product/lang/zh-tw.php | 3 +- module/productplan/lang/zh-tw.php | 2 +- module/productplan/view/browse.html.php | 2 +- module/project/control.php | 2 +- module/project/js/bug.js | 4 -- module/project/lang/zh-tw.php | 2 + module/project/view/bug.html.php | 62 ++++++++++++++----------- module/release/lang/zh-tw.php | 59 +++++++++++------------ module/task/lang/zh-tw.php | 1 + 17 files changed, 197 insertions(+), 159 deletions(-) diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 8e98127a15..775b339d70 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -83,21 +83,33 @@ $lang->block->default['product']['4']['params']['num'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = '進行中的' . $lang->projectCommon; -$lang->block->default['project']['1']['block'] = 'list'; +$lang->block->default['project']['1']['title'] = $lang->projectCommon . '統計'; +$lang->block->default['project']['1']['block'] = 'statistic'; $lang->block->default['project']['1']['grid'] = 8; -$lang->block->default['project']['1']['params']['num'] = 15; $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['1']['params']['type'] = 'undone'; +$lang->block->default['project']['1']['params']['type'] = 'noclosed'; +$lang->block->default['project']['1']['params']['num'] = 5; -$lang->block->default['project']['2']['title'] = '指派給我的任務'; -$lang->block->default['project']['2']['block'] = 'task'; +$lang->block->default['project']['2']['title'] = $lang->projectCommon . '總覽'; +$lang->block->default['project']['2']['block'] = 'overview'; $lang->block->default['project']['2']['grid'] = 4; -$lang->block->default['project']['2']['params']['num'] = 15; -$lang->block->default['project']['2']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['2']['params']['type'] = 'assignedTo'; +$lang->block->default['project']['3']['title'] = '進行中的' . $lang->projectCommon; +$lang->block->default['project']['3']['block'] = 'list'; +$lang->block->default['project']['3']['grid'] = 8; + +$lang->block->default['project']['3']['params']['num'] = 15; +$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['project']['3']['params']['type'] = 'undone'; + +$lang->block->default['project']['4']['title'] = '指派給我的任務'; +$lang->block->default['project']['4']['block'] = 'task'; +$lang->block->default['project']['4']['grid'] = 4; + +$lang->block->default['project']['4']['params']['num'] = 15; +$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['project']['4']['params']['type'] = 'assignedTo'; $lang->block->default['qa']['1']['title'] = '指派給我的Bug'; $lang->block->default['qa']['1']['block'] = 'bug'; @@ -232,9 +244,11 @@ $lang->block->modules['product']->availableBlocks->plan = '計劃列表'; $lang->block->modules['product']->availableBlocks->release = '發佈列表'; $lang->block->modules['project'] = new stdclass(); $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . '列表'; -$lang->block->modules['project']->availableBlocks->task = '任務列表'; -$lang->block->modules['project']->availableBlocks->build = '版本列表'; +$lang->block->modules['project']->availableBlocks->statistic = $lang->projectCommon . '統計'; +$lang->block->modules['project']->availableBlocks->overview = $lang->projectCommon . '總覽'; +$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . '列表'; +$lang->block->modules['project']->availableBlocks->task = '任務列表'; +$lang->block->modules['project']->availableBlocks->build = '版本列表'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); $lang->block->modules['qa']->availableBlocks->bug = 'Bug列表'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index d11e141768..8c1ede15c1 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -100,6 +100,7 @@ $lang->bug->setPublic = 'Set as Public Template'; $lang->bug->deleteTemplate = 'Delete Template'; $lang->bug->confirmStoryChange = 'Confirm Story Change'; $lang->bug->copy = 'Copy'; +$lang->bug->search = 'Search'; /* 查询条件列表。*/ $lang->bug->assignToMe = 'AssignedToMe'; @@ -128,13 +129,13 @@ $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; /* 页面标签。*/ -$lang->bug->lblAssignedTo = 'Assignee'; -$lang->bug->lblMailto = 'Mail To'; -$lang->bug->lblLastEdited = 'Last Edited'; -$lang->bug->lblResolved = 'Resolved By'; -$lang->bug->allUsers = 'All User'; -$lang->bug->allBuilds = 'All'; -$lang->bug->createBuild = 'New'; +$lang->bug->lblAssignedTo = 'Assignee'; +$lang->bug->lblMailto = 'Mail To'; +$lang->bug->lblLastEdited = 'Last Edited'; +$lang->bug->lblResolved = 'Resolved By'; +$lang->bug->allUsers = 'All User'; +$lang->bug->allBuilds = 'All'; +$lang->bug->createBuild = 'New'; /* legend列表。*/ $lang->bug->legendBasicInfo = 'Basic Info'; @@ -149,7 +150,7 @@ $lang->bug->legendMisc = 'Misc'; $lang->bug->legendRelated = 'Related Info'; /* 功能按钮。*/ -$lang->bug->buttonConfirm = 'Confirm'; +$lang->bug->buttonConfirm = 'Confirm'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will cause linked {$lang->projectCommon},Story and Task change. Do you want to do this?"; @@ -233,10 +234,6 @@ $lang->bug->typeList['standard'] = 'Standard'; $lang->bug->typeList['automation'] = 'Testing Script'; $lang->bug->typeList['others'] = 'Other'; - - - - $lang->bug->statusList[''] = ''; $lang->bug->statusList['active'] = 'Active'; $lang->bug->statusList['resolved'] = 'Resolved'; @@ -376,8 +373,6 @@ $lang->bug->mySelects['resolvedbyme'] = $lang->bug->resolvedByMeAB; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; - - $lang->bug->featureBar['browse']['my'] = $lang->bug->my; $lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->unconfirmed; $lang->bug->featureBar['browse']['assigntonull'] = $lang->bug->assignToNull; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index d04c8a23da..56657065ad 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -100,6 +100,7 @@ $lang->bug->setPublic = '设为公共模板'; $lang->bug->deleteTemplate = '删除模板'; $lang->bug->confirmStoryChange = '确认需求变动'; $lang->bug->copy = '复制Bug'; +$lang->bug->search = '搜索'; /* 查询条件列表。*/ $lang->bug->assignToMe = '指派给我'; @@ -118,7 +119,7 @@ $lang->bug->allBugs = '所有'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求变动'; $lang->bug->allProduct = '所有' . $lang->productCommon; - +$lang->bug->my = '我的'; $lang->bug->assignToMeAB = '指派给我'; $lang->bug->openedByMeAB = '由我创建'; @@ -128,13 +129,13 @@ $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '该bug与上一bug不属于同一产品!'; /* 页面标签。*/ -$lang->bug->lblAssignedTo = '当前指派'; -$lang->bug->lblMailto = '抄送给'; -$lang->bug->lblLastEdited = '最后修改'; -$lang->bug->lblResolved = '由谁解决'; -$lang->bug->allUsers = '所有用户'; -$lang->bug->allBuilds = '所有'; -$lang->bug->createBuild = '新建'; +$lang->bug->lblAssignedTo = '当前指派'; +$lang->bug->lblMailto = '抄送给'; +$lang->bug->lblLastEdited = '最后修改'; +$lang->bug->lblResolved = '由谁解决'; +$lang->bug->allUsers = '所有用户'; +$lang->bug->allBuilds = '所有'; +$lang->bug->createBuild = '新建'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; @@ -149,7 +150,7 @@ $lang->bug->legendMisc = '其他相关'; $lang->bug->legendRelated = '其他信息'; /* 功能按钮。*/ -$lang->bug->buttonConfirm = '确认'; +$lang->bug->buttonConfirm = '确认'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、需求和任务发生变化,确定吗?"; @@ -369,10 +370,6 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '选择相关版本...'; $lang->bug->placeholder->newBuildName = '新版本名称'; - - - - $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 7051f98f04..c54d6bc22f 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -100,6 +100,7 @@ $lang->bug->setPublic = '設為公共模板'; $lang->bug->deleteTemplate = '刪除模板'; $lang->bug->confirmStoryChange = '確認需求變動'; $lang->bug->copy = '複製Bug'; +$lang->bug->search = '搜索'; /* 查詢條件列表。*/ $lang->bug->assignToMe = '指派給我'; @@ -118,7 +119,7 @@ $lang->bug->allBugs = '所有'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求變動'; $lang->bug->allProduct = '所有' . $lang->productCommon; - +$lang->bug->my = '我的'; $lang->bug->assignToMeAB = '指派給我'; $lang->bug->openedByMeAB = '由我創建'; @@ -128,13 +129,13 @@ $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品!'; /* 頁面標籤。*/ -$lang->bug->lblAssignedTo = '當前指派'; -$lang->bug->lblMailto = '抄送給'; -$lang->bug->lblLastEdited = '最後修改'; -$lang->bug->lblResolved = '由誰解決'; -$lang->bug->allUsers = '所有用戶'; -$lang->bug->allBuilds = '所有'; -$lang->bug->createBuild = '新建'; +$lang->bug->lblAssignedTo = '當前指派'; +$lang->bug->lblMailto = '抄送給'; +$lang->bug->lblLastEdited = '最後修改'; +$lang->bug->lblResolved = '由誰解決'; +$lang->bug->allUsers = '所有用戶'; +$lang->bug->allBuilds = '所有'; +$lang->bug->createBuild = '新建'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; @@ -149,7 +150,7 @@ $lang->bug->legendMisc = '其他相關'; $lang->bug->legendRelated = '其他信息'; /* 功能按鈕。*/ -$lang->bug->buttonConfirm = '確認'; +$lang->bug->buttonConfirm = '確認'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、需求和任務發生變化,確定嗎?"; @@ -369,10 +370,6 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '選擇相關版本...'; $lang->bug->placeholder->newBuildName = '新版本名稱'; - - - - $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe; diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php index a1b2c948d1..906c322a0c 100644 --- a/module/build/lang/zh-tw.php +++ b/module/build/lang/zh-tw.php @@ -9,17 +9,17 @@ * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->build->common = "版本"; -$lang->build->create = "創建版本"; -$lang->build->edit = "編輯版本"; -$lang->build->linkStory = "關聯需求"; -$lang->build->linkBug = "關聯Bug"; -$lang->build->delete = "刪除版本"; -$lang->build->deleted = "已刪除"; -$lang->build->view = "版本詳情"; -$lang->build->batchUnlink = '批量移除'; -$lang->build->batchUnlinkStory = '批量移除需求'; -$lang->build->batchUnlinkBug = '批量移除Bug'; +$lang->build->common = "版本"; +$lang->build->create = "創建版本"; +$lang->build->edit = "編輯版本"; +$lang->build->linkStory = "關聯需求"; +$lang->build->linkBug = "關聯Bug"; +$lang->build->delete = "刪除版本"; +$lang->build->deleted = "已刪除"; +$lang->build->view = "版本詳情"; +$lang->build->batchUnlink = '批量移除'; +$lang->build->batchUnlinkStory = '批量移除需求'; +$lang->build->batchUnlinkBug = '批量移除Bug'; $lang->build->confirmDelete = "您確認刪除該版本嗎?"; $lang->build->confirmUnlinkStory = "您確認移除該需求嗎?"; @@ -27,25 +27,26 @@ $lang->build->confirmUnlinkBug = "您確認移除該Bug嗎?"; $lang->build->basicInfo = '基本信息'; -$lang->build->id = 'ID'; -$lang->build->product = $lang->productCommon; -$lang->build->branch = '平台/分支'; -$lang->build->project = '所屬' . $lang->projectCommon; -$lang->build->name = '名稱編號'; -$lang->build->date = '打包日期'; -$lang->build->builder = '構建者'; -$lang->build->scmPath = '原始碼地址'; -$lang->build->filePath = '下載地址'; -$lang->build->desc = '描述'; -$lang->build->files = '上傳發行包'; -$lang->build->last = '上個版本'; -$lang->build->packageType = '包類型'; -$lang->build->unlinkStory = '移除需求'; -$lang->build->unlinkBug = '移除Bug'; -$lang->build->stories = '完成的需求'; -$lang->build->bugs = '解決的Bug'; -$lang->build->generatedBugs = '產生的Bug'; -$lang->build->noProduct = " 該{$lang->projectCommon}沒有關聯{$lang->productCommon},無法創建版本,請先關聯{$lang->productCommon}"; +$lang->build->id = 'ID'; +$lang->build->product = $lang->productCommon; +$lang->build->branch = '平台/分支'; +$lang->build->project = '所屬' . $lang->projectCommon; +$lang->build->name = '名稱編號'; +$lang->build->date = '打包日期'; +$lang->build->builder = '構建者'; +$lang->build->scmPath = '原始碼地址'; +$lang->build->filePath = '下載地址'; +$lang->build->desc = '描述'; +$lang->build->files = '上傳發行包'; +$lang->build->last = '上個版本'; +$lang->build->packageType = '包類型'; +$lang->build->unlinkStory = '移除需求'; +$lang->build->unlinkBug = '移除Bug'; +$lang->build->stories = '完成的需求'; +$lang->build->bugs = '解決的Bug'; +$lang->build->generatedBugs = '產生的Bug'; +$lang->build->noProduct = " 該{$lang->projectCommon}沒有關聯{$lang->productCommon},無法創建版本,請先關聯{$lang->productCommon}"; +$lang->build->noData = '暫無'; $lang->build->finishStories = ' 本次共完成 %s 個需求'; $lang->build->resolvedBugs = ' 本次共解決 %s 個Bug'; diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 3faeb1c80c..582d09f336 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -297,7 +297,13 @@ tbody tr td:first-child input{display:none;} config->global->flow != 'onlyTest'):?> build->desc;?> -
    desc;?>
    + + desc):?> +
    desc;?>
    + + build->noData;?> + + diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 9abee99b4e..6f2714a738 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -111,7 +111,7 @@ $lang->common->common = '公有模組'; $lang->menu = new stdclass(); $lang->menu->my = ' 我的地盤|my|index'; $lang->menu->product = $lang->productCommon . '|product|index|locate=no'; -$lang->menu->project = $lang->projectCommon . '|project|index'; +$lang->menu->project = $lang->projectCommon . '|project|index|locate=no'; $lang->menu->qa = '測試|qa|index'; $lang->menu->doc = '文檔|doc|index'; $lang->menu->report = '統計|report|index'; @@ -221,21 +221,42 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); +$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,importbug,tree'); +$lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s'); +$lang->project->menu->burn = array('link' => '燃盡圖|project|burn|projectID=%s'); $lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; -$lang->project->menu->dynamic = '動態|project|dynamic|projectID=%s'; -$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); -$lang->project->menu->testtask = array('link' => '測試單|project|testtask|projectID=%s'); -$lang->project->menu->team = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers'); +$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'build'); $lang->project->menu->doc = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); +$lang->project->menu->action = array('link' => '%s'); $lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; +$lang->project->menu->team = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->view = array('link' => '概況|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); +$lang->project->subMenu = new stdclass(); +$lang->project->subMenu->list = new stdclass(); +$lang->project->subMenu->list->task = '任務列表|project|task|projectID=%s'; +$lang->project->subMenu->list->tree = '樹狀圖|project|tree|projectID=%s'; +$lang->project->subMenu->list->groupTask = '分組視圖|project|groupTask|projectID=%s'; + +$lang->project->subMenu->qa = new stdclass(); +$lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s'; +$lang->project->subMenu->qa->build = '版本|project|build|projectID=%s'; +$lang->project->subMenu->qa->testtask = '測試單|project|testtask|projectID=%s'; + +$lang->project->subMenu->action = new stdclass(); +$lang->project->subMenu->action->dynamic = '動態|project|dynamic|projectID=%s'; + +$lang->project->dividerMenu = ',story,doc,'; + $lang->task = new stdclass(); $lang->build = new stdclass(); -$lang->task->menu = $lang->project->menu; -$lang->build->menu = $lang->project->menu; +$lang->task->menu = $lang->project->menu; +$lang->task->subMenu = $lang->project->subMenu; +$lang->build->menu = $lang->project->menu; +$lang->build->subMenu = $lang->project->subMenu; + +$lang->task->dividerMenu = $lang->project->dividerMenu; +$lang->build->dividerMenu = $lang->project->dividerMenu; /* QA視圖菜單設置。*/ $lang->qa = new stdclass(); diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php index 661f560f6f..e6ef1fea70 100644 --- a/module/extension/lang/zh-tw.php +++ b/module/extension/lang/zh-tw.php @@ -106,8 +106,8 @@ $lang->extension->errorPackageFileExists = '下載路徑已經有一個名 $lang->extension->errorDownloadFailed = '下載失敗,請重新下載。如果多次重試還不行,請嘗試手工下載,然後通過上傳功能上傳。'; $lang->extension->errorMd5Checking = '下載檔案不完整,請重新下載。如果多次重試還不行,請嘗試手工下載,然後通過上傳功能上傳。'; $lang->extension->errorExtracted = '包檔案 %s 解壓縮失敗,可能不是一個有效的zip檔案。錯誤信息如下:
    %s'; -$lang->extension->errorCheckIncompatible = '該插件與禪道版本不兼容,%s後可能無法使用。

    您可以選擇 強制%s 或者 取消

    '; -$lang->extension->errorFileConflicted = '有以下檔案衝突:
    %s

    您可以選擇 覆蓋 或者 取消

    '; +$lang->extension->errorCheckIncompatible = '該插件與禪道版本不兼容,%s後可能無法使用。
    您可以選擇 強制%s 或者 取消
    '; +$lang->extension->errorFileConflicted = '有以下檔案衝突:
    %s
    您可以選擇 覆蓋 或者 取消
    '; $lang->extension->errorPackageNotFound = '包檔案 %s 沒有找到,可能是因為自動下載失敗。您可以嘗試再次下載。'; $lang->extension->errorTargetPathNotWritable = '目標路徑 %s 不可寫。'; $lang->extension->errorTargetPathNotExists = '目標路徑 %s 不存在。'; diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index c77f7382b5..6b717cec59 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -75,6 +75,7 @@ $lang->product->release = '發佈'; $lang->product->latestDynamic = '最新動態'; $lang->product->iteration = '版本迭代'; $lang->product->iterationInfo = '迭代 %s 次'; +$lang->product->iterationView = '查看詳情'; $lang->product->searchStory = '搜索'; $lang->product->assignedToMe = '指給我'; @@ -116,7 +117,7 @@ $lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名 $lang->product->storySummary = "本頁共 %s 個需求,預計 %s 個工時,用例覆蓋率%s。"; $lang->product->checkedSummary = "選中 %total% 個需求,預計 %estimate% 個工時,用例覆蓋率%rate%。"; -$lang->product->noModule = '您現在還沒有模組信息
    請維護產品模組'; +$lang->product->noModule = '
    您現在還沒有模組信息
    請維護產品模組
    '; $lang->product->noProduct = '暫時沒有產品,您現在可以'; $lang->product->noStory = '暫時沒有需求,您現在可以'; $lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon; diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php index 71511ea2d0..932d1a3b12 100644 --- a/module/productplan/lang/zh-tw.php +++ b/module/productplan/lang/zh-tw.php @@ -17,7 +17,7 @@ $lang->productplan->edit = "編輯計劃"; $lang->productplan->delete = "刪除計劃"; $lang->productplan->view = "計劃詳情"; $lang->productplan->bugSummary = "本頁共 %s 個Bug"; -$lang->productplan->info = '信息'; +$lang->productplan->basicInfo = '基本信息'; $lang->productplan->batchEdit = '批量編輯'; $lang->productplan->batchUnlink = "批量移除"; diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 8fa1c357d9..ecd284c006 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -104,7 +104,7 @@
    - edit);?> + edit, '', 'btn');?>
    show('right', 'pagerjs');?> diff --git a/module/project/control.php b/module/project/control.php index eebaf3c24c..a3238863d8 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -94,7 +94,7 @@ class project extends control $actions = $this->loadModel('action')->getList('project', $projectID); /* Set menu. */ - $this->project->setMenu($this->projects, $projectID, $extra); + $this->project->setMenu($this->projects, $projectID, $buildID = 0, $extra); /* Assign. */ $this->view->projects = $this->projects; diff --git a/module/project/js/bug.js b/module/project/js/bug.js index fe630d0cf3..e69de29bb2 100644 --- a/module/project/js/bug.js +++ b/module/project/js/bug.js @@ -1,4 +0,0 @@ -$(document).ready(function() -{ - ajaxGetSearchForm(); -}); diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 7dcf7f637c..a6de7c7673 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -147,6 +147,7 @@ $lang->project->storySort = '需求排序'; $lang->project->importPlanStory = '創建' . $lang->projectCommon . '成功!\n是否導入計劃關聯的相關需求?'; $lang->project->iteration = '版本迭代'; $lang->project->iterationInfo = '迭代%s次'; +$lang->project->viewAll = '查看所有'; /* 分組瀏覽。*/ $lang->project->allTasks = '所有'; @@ -213,6 +214,7 @@ $lang->project->copyFromProject = "複製自{$lang->projectCommon} %sproject->cancelCopy = '取消複製'; $lang->project->byPeriod = '按時間段'; $lang->project->byUser = '按用戶'; +$lang->project->noProject = '暫時沒有項目,您現在可以'; /* 交互提示。*/ $lang->project->confirmDelete = "您確定刪除{$lang->projectCommon}[%s]嗎?"; diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index b7329276a3..3e907fb63b 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -15,78 +15,83 @@
    icons['bug']);?> project->bug;?> - Build:' . $build->name . ''; ?> + recTotal;?> + Build:' . $build->name . '';?> + bug->search;?>
    - - id");?> + " . $lang->bug->export, '', "class='btn btn-link export iframe'");?> + id", " " . $lang->bug->create, '', "class='btn btn-primary'");?>
    -
    +
    + + id}&orderBy=%s&build=$buildID&type=$type¶m=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?> - id}&orderBy=%s&build=$buildID&type=$type¶m=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?> - + - + - + - - +
    +
    + idAB);?>
    bug->severityAB);?> priAB);?> priAB);?> bug->title);?> openedByAB);?> assignedToAB);?>assignedToAB);?> bug->resolvedBy);?> bug->resolutionAB);?>actions;?>actions;?>
    -
    - - - id);?> -
    +
    + + id => sprintf('%03d', $bug->id)));?> + + id);?> + bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> pri?>'>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> openedBy, $bug->openedBy);?>assignedTo, $bug->assignedTo);?> + id";?> + + assignedTo, $bug->assignedTo);?> + resolvedBy, $bug->resolvedBy);?> bug->resolutionList[$bug->resolution];?> - id";?>
    - product&branch=$bug->branch&extra=bugID=$bug->id", $bug, 'list', 'copy'); - ?> + status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);?>
    status == 'active') common::printIcon('bug', 'resolve', $params, $bug, 'list', 'check', '', 'iframe', true); + if($bug->status != 'active') common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy'); + common::printIcon('bug', 'edit', $params, $bug, 'list'); ?>
    - +
    - + + diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php index 1dc1c8420e..015d320394 100644 --- a/module/release/lang/zh-tw.php +++ b/module/release/lang/zh-tw.php @@ -9,15 +9,15 @@ * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = '發佈'; -$lang->release->create = "創建發佈"; -$lang->release->edit = "編輯發佈"; -$lang->release->linkStory = "關聯需求"; -$lang->release->linkBug = "關聯Bug"; -$lang->release->delete = "刪除發佈"; -$lang->release->deleted = '已刪除'; -$lang->release->view = "發佈詳情"; -$lang->release->browse = "瀏覽發佈"; +$lang->release->common = '發佈'; +$lang->release->create = "創建發佈"; +$lang->release->edit = "編輯發佈"; +$lang->release->linkStory = "關聯需求"; +$lang->release->linkBug = "關聯Bug"; +$lang->release->delete = "刪除發佈"; +$lang->release->deleted = '已刪除'; +$lang->release->view = "發佈詳情"; +$lang->release->browse = "瀏覽發佈"; $lang->release->changeStatus = "修改狀態"; $lang->release->batchUnlink = "批量移除"; $lang->release->batchUnlinkStory = "批量移除需求"; @@ -29,26 +29,27 @@ $lang->release->confirmUnlinkBug = "您確認移除該Bug嗎?"; $lang->release->basicInfo = '基本信息'; -$lang->release->id = 'ID'; -$lang->release->product = $lang->productCommon; -$lang->release->branch = '平台/分支'; -$lang->release->build = '版本'; -$lang->release->name = '發佈名稱'; -$lang->release->date = '發佈日期'; -$lang->release->desc = '描述'; -$lang->release->status = '狀態'; -$lang->release->last = '上次發佈'; -$lang->release->unlinkStory = '移除需求'; -$lang->release->unlinkBug = '移除Bug'; -$lang->release->stories = '完成的需求'; -$lang->release->bugs = '解決的Bug'; -$lang->release->leftBugs = '遺留的Bug'; -$lang->release->generatedBugs = '遺留的Bug'; -$lang->release->finishStories = '本次共完成 %s 個需求'; -$lang->release->resolvedBugs = '本次共解決 %s 個Bug'; -$lang->release->createdBugs = '本次共遺留 %s 個Bug'; -$lang->release->export = '導出HTML'; -$lang->release->yesterday = '昨日發佈'; +$lang->release->id = 'ID'; +$lang->release->product = $lang->productCommon; +$lang->release->branch = '平台/分支'; +$lang->release->build = '版本'; +$lang->release->name = '發佈名稱'; +$lang->release->marker = '里程碑'; +$lang->release->date = '發佈日期'; +$lang->release->desc = '描述'; +$lang->release->status = '狀態'; +$lang->release->last = '上次發佈'; +$lang->release->unlinkStory = '移除需求'; +$lang->release->unlinkBug = '移除Bug'; +$lang->release->stories = '完成的需求'; +$lang->release->bugs = '解決的Bug'; +$lang->release->leftBugs = '遺留的Bug'; +$lang->release->generatedBugs = '遺留的Bug'; +$lang->release->finishStories = '本次共完成 %s 個需求'; +$lang->release->resolvedBugs = '本次共解決 %s 個Bug'; +$lang->release->createdBugs = '本次共遺留 %s 個Bug'; +$lang->release->export = '導出HTML'; +$lang->release->yesterday = '昨日發佈'; $lang->release->filePath = '下載地址:'; $lang->release->scmPath = '版本庫地址:'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 74064b18e4..c9b9de6417 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -167,6 +167,7 @@ $lang->task->confirmRecord = '"剩餘"為0,任務將標記為"已完 $lang->task->noticeLinkStory = "沒有可關聯的相關需求,您可以為當前項目%s,然後%s"; $lang->task->noticeSaveRecord = '您有尚未保存的工時記錄,請先將其保存。'; $lang->task->commentActions = '%s. %s, 由 %s 添加備註。'; +$lang->task->noData = '暫無'; $lang->task->error = new stdclass(); $lang->task->error->consumedNumber = '"已經消耗"必須為數字'; From 960e0af5d207273a915851264f2db018e6febe01 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 26 Apr 2018 17:17:47 +0800 Subject: [PATCH 6/7] * adjust for show count. --- module/action/lang/en.php | 9 +++++++++ module/action/lang/zh-cn.php | 8 ++++++++ module/action/model.php | 19 ------------------- module/company/control.php | 1 - module/company/view/dynamic.html.php | 19 +++++++++++-------- module/my/control.php | 2 -- module/my/view/dynamic.html.php | 17 ++++++++++------- module/my/view/todo.html.php | 9 +++++++-- module/product/control.php | 2 -- module/product/view/browse.html.php | 2 +- module/product/view/dynamic.html.php | 17 ++++++++++------- module/project/control.php | 1 - module/project/view/dynamic.html.php | 19 +++++++++++-------- module/story/model.php | 12 ------------ 14 files changed, 67 insertions(+), 70 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 3b96649611..332d02b3cd 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -25,6 +25,7 @@ $lang->action->undelete = 'Restore'; $lang->action->hideOne = 'Hide'; $lang->action->hideAll = 'Hide All'; $lang->action->editComment = 'Edit'; +$lang->action->create = 'Create Comment'; $lang->action->comment = 'Comment'; $lang->action->trashTips = 'Note: All Deletion in ZenTao are logical.'; @@ -53,6 +54,14 @@ $lang->action->dynamic->all = 'All'; $lang->action->dynamic->hidden = 'Hidden'; $lang->action->dynamic->search = 'Search'; +$lang->action->periods['all'] = $lang->action->dynamic->all; +$lang->action->periods['today'] = $lang->action->dynamic->today; +$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday; +$lang->action->periods['thisweek'] = $lang->action->dynamic->thisWeek; +$lang->action->periods['lastweek'] = $lang->action->dynamic->lastWeek; +$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth; +$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth; + $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['story'] = 'Story'; $lang->action->objectTypes['productplan'] = 'Plan'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index cec1875adc..5fd841c37c 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -54,6 +54,14 @@ $lang->action->dynamic->all = '所有'; $lang->action->dynamic->hidden = '已隐藏'; $lang->action->dynamic->search = '搜索'; +$lang->action->periods['all'] = $lang->action->dynamic->all; +$lang->action->periods['today'] = $lang->action->dynamic->today; +$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday; +$lang->action->periods['thisweek'] = $lang->action->dynamic->thisWeek; +$lang->action->periods['lastweek'] = $lang->action->dynamic->lastWeek; +$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth; +$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth; + $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['story'] = '需求'; $lang->action->objectTypes['productplan'] = '计划'; diff --git a/module/action/model.php b/module/action/model.php index c933e90787..04cbb03805 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -967,25 +967,6 @@ class actionModel extends model $this->file->updateObjectID($this->post->uid, $action->objectID, $action->objectType); } - /** - * Get action count. - * - * @param string $type - * @param string $id - * @access public - * @return int - */ - public function getCount($type = 'account', $id = '') - { - if($type == 'account' and empty($id)) $id = $this->app->user->account; - return $this->dao->select('count(*) AS count')->from(TABLE_ACTION) - ->where('1=1') - ->beginIF($type == 'account')->andWhere('actor')->eq($id)->fi() - ->beginIF($type == 'product')->andWhere('product')->like("%,$id,%")->fi() - ->beginIF($type == 'project')->andWhere('project')->eq($id)->fi() - ->fetch('count'); - } - /** * Build date group by actions * diff --git a/module/company/control.php b/module/company/control.php index 43df49b69c..5ee6686219 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -235,7 +235,6 @@ class company extends control $this->view->pager = $pager; $this->view->param = $param; $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction); - $this->view->allCount = $this->action->getCount('all'); $this->view->direction = $direction; $this->display(); } diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index bd57fcc688..ddb9dcd48d 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -13,15 +13,18 @@