From e8d577ec6802742f13bcefeb491f890b00ba4189 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 26 Jul 2019 14:34:07 +0800 Subject: [PATCH 1/8] * Finish task #8340. --- module/block/js/admin.js | 1 - 1 file changed, 1 deletion(-) diff --git a/module/block/js/admin.js b/module/block/js/admin.js index 1a494f030f..b0f3363e4f 100644 --- a/module/block/js/admin.js +++ b/module/block/js/admin.js @@ -4,7 +4,6 @@ $(function() var preValue = ''; $(document).on('change', '#blockParams #paramstype', function() { - console.log(preValue); $title = $('#blockParams').find('#title'); var value = $(this).find('option:selected').html(); if($title.val().indexOf(blockTitle + ' - ' + preValue) >= 0) $title.val(blockTitle + ' - ' + value); From 11404183bb184707d8dbbf6b350ebd8144c1232d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 26 Jul 2019 14:52:45 +0800 Subject: [PATCH 2/8] * finish task #8344,8345. --- module/productplan/view/linkbug.html.php | 2 +- module/productplan/view/linkstory.html.php | 2 +- module/productplan/view/view.html.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 5abe4c585a..62d713de1f 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -66,7 +66,7 @@
id&type=bug&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index c41c51d528..178517f9a5 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -74,7 +74,7 @@
id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?>
-
+
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index ee52dc4d8e..e33df31a7c 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -38,7 +38,7 @@ if(!$plan->deleted) { $flow = $this->loadModel('workflow')->getByModule('productplan'); - echo $this->loadModel('flow')->buildOperateMenu($flow, $productplan, 'view'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $plan, 'view'); if(common::hasPriv('productplan', 'create') and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), " " . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'"); if(common::hasPriv('productplan', 'edit')) echo html::a($this->createLink('productplan', 'edit', "planID=$plan->id"), " " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'"); From ae56637431353518e5c2ac637db807d65736132d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 26 Jul 2019 14:56:12 +0800 Subject: [PATCH 3/8] * finish task #8346. --- module/project/css/view.css | 2 +- module/project/view/view.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/project/css/view.css b/module/project/css/view.css index 3d4fa17dfb..30864b2f22 100644 --- a/module/project/css/view.css +++ b/module/project/css/view.css @@ -1,5 +1,5 @@ .block-burn .panel-body{margin-top: 20px;} -.data-stats .widthTr td{padding:0px;} +.data-stats .statsTr td{padding:0px;} #burnWrapper {max-width: 400px; margin: 0 auto; padding: 8px; position: relative;} #burnYUnit {position: absolute; color: #CBD0DB; top: -10px; left: 10px;} diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 9a66fe97cc..57fb65d5a8 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -229,7 +229,7 @@
- + - + From 5deed47298cf7b784ab9442e75dd809015ae0244 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 26 Jul 2019 15:02:05 +0800 Subject: [PATCH 6/8] * Finish task #8343. --- module/editor/lang/en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php index 64e9f2b9f4..a8ef43ff1a 100644 --- a/module/editor/lang/en.php +++ b/module/editor/lang/en.php @@ -36,7 +36,7 @@ $lang->editor->editFileError = 'You can only modify ZenTao files!'; $lang->editor->notWritable = "Not wirtable. Permission is required. Please try chmod 777 -R "; $lang->editor->notDelete = 'Cannot be deleted. Please check your permissions!'; $lang->editor->emptyFileName = 'Please enter a File Name!'; -$lang->editor->onlyLocalVisit = "This feature only works when the IP is 127.0.0.1. Help"; +$lang->editor->onlyLocalVisit = "This feature only works when the IP is 127.0.0.1 for security. Help"; $lang->editor->translate['config.php'] = 'config'; $lang->editor->translate['control.php'] = 'control'; From 8555d3ac21585974b9134cffdb2c54bb8eaff50e Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 26 Jul 2019 15:15:07 +0800 Subject: [PATCH 7/8] * Finish task #8349. --- module/score/lang/en.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/score/lang/en.php b/module/score/lang/en.php index 8730b63200..ae533d5725 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = 'Save Template'; $lang->score->methods['testtask']['runCase'] = 'Run Test Case'; $lang->score->methods['testcase']['create'] = 'Create Test Case'; $lang->score->methods['build']['create'] = 'Create Build'; -$lang->score->methods['project']['create'] = 'Create Project'; -$lang->score->methods['project']['close'] = 'Finish Project'; +$lang->score->methods['project']['create'] = "Create {$lang->projectCommon}"; +$lang->score->methods['project']['close'] = "Finish {$lang->projectCommon}"; $lang->score->methods['productplan']['create'] = 'Create Plan'; $lang->score->methods['release']['create'] = 'Create Release'; $lang->score->methods['block']['set'] = 'Custom Block'; From 1928dc0e69c54cc910e0de6dc6bef47155633a8c Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 26 Jul 2019 15:19:48 +0800 Subject: [PATCH 8/8] * Finish task #8350. --- module/search/view/buildform.html.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index e6bb35c3a6..b23e58def0 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -60,6 +60,11 @@ $operatorWidth = common::checkEnLang() ? 'w-110px' : 'w-90px'; #toggle-queries{position: absolute; right: 0px; top: 40px; width: 13px; background: #79cdfb; border-radius: 6px; height: 30px;cursor: pointer} #toggle-queries .icon{ position: absolute; top: 6px; right: -2px; color: #fff;} + +
+ +
+' target='hiddenwin' id='' class='search-form'>
totalConsumed + $project->totalLeft) ? round($project->totalConsumed / ($project->totalConsumed + $project->totalLeft), 3) * 100 : 0;?> From aeda35218e18e7529ef21c91ebb4247100ee17f0 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 26 Jul 2019 15:00:57 +0800 Subject: [PATCH 4/8] * Finish task #8342. --- module/datatable/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/datatable/model.php b/module/datatable/model.php index 899329d063..7899dc48f7 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -41,7 +41,7 @@ class datatableModel extends model $fields = $this->loadModel('workflowfield')->getList($module); foreach($fields as $field) { - if($field->buildin == 1) continue; + 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'; From 964ab3bf31321f22e35ef6afd1f0a838b6e3a9fd Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 26 Jul 2019 15:01:05 +0800 Subject: [PATCH 5/8] * finish task #8348. --- module/project/view/all.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index b934cd8dfc..8542e3235f 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -40,7 +40,7 @@ project->name);?> project->code);?> project->PM);?> project->end);?> project->status);?>
-
- -

search->savedQuery;?>