From c90aac3512463ad1f6257f4ef5e8d02635c8380d Mon Sep 17 00:00:00 2001 From: jinianlan Date: Mon, 29 Jul 2019 15:54:08 +0800 Subject: [PATCH] * finish task #6166,#6149,6139 --- db/update11.6.sql | 4 +++ module/action/model.php | 2 +- module/admin/view/safe.html.php | 2 +- module/backup/view/index.html.php | 2 +- module/block/view/projectblock.html.php | 2 +- module/block/view/todoblock.html.php | 2 +- module/branch/model.php | 4 +-- module/bug/view/browse.html.php | 8 +++--- module/bug/view/edit.html.php | 4 +-- module/bug/view/resolve.html.php | 2 +- module/bug/view/view.html.php | 4 +-- module/common/model.php | 4 +-- module/company/view/dynamic.html.php | 2 +- module/company/view/edit.html.php | 2 +- module/custom/view/required.html.php | 2 +- module/custom/view/set.html.php | 2 +- module/dept/view/edit.html.php | 2 +- module/doc/view/index.html.php | 2 +- module/doc/view/side.html.php | 2 +- module/group/view/manageview.html.php | 2 +- module/group/view/privbygroup.html.php | 6 ++--- module/mail/view/index.html.php | 2 +- module/message/css/setting.css | 2 +- module/message/model.php | 2 +- module/misc/view/changelog.html.php | 2 +- module/my/view/changepassword.html.php | 2 +- module/product/view/browse.html.php | 2 +- module/product/view/dynamic.html.php | 2 +- module/product/view/roadmap.html.php | 2 +- module/product/view/view.html.php | 2 +- module/project/control.php | 2 +- module/project/view/all.html.php | 2 +- module/project/view/burn.html.php | 2 +- module/project/view/dynamic.html.php | 2 +- module/project/view/task.html.php | 2 +- module/project/view/treestory.html.php | 2 +- module/report/view/bugassign.html.php | 2 +- module/report/view/bugcreate.html.php | 2 +- module/report/view/productsummary.html.php | 4 +-- module/report/view/projectdeviation.html.php | 2 +- module/report/view/workload.html.php | 2 +- module/search/view/buildform.html.php | 6 ++--- module/story/view/close.html.php | 2 +- module/story/view/create.html.php | 2 +- module/story/view/edit.html.php | 4 +-- module/story/view/review.html.php | 2 +- module/story/view/view.html.php | 4 +-- module/story/view/zerocase.html.php | 2 +- module/task/view/activate.html.php | 2 +- module/task/view/edit.html.php | 4 +-- module/task/view/finish.html.php | 2 +- module/task/view/recordestimate.html.php | 2 +- module/task/view/view.html.php | 4 +-- module/testcase/view/caseheader.html.php | 2 +- module/testcase/view/view.html.php | 6 ++--- module/todo/view/create.html.php | 4 +-- module/todo/view/edit.html.php | 2 +- module/todo/view/view.html.php | 4 +-- module/translate/control.php | 6 ++--- module/translate/model.php | 26 ++++++++++---------- module/translate/view/choosemodule.html.php | 2 +- module/translate/view/index.html.php | 2 +- module/tree/view/edit.html.php | 2 +- module/user/view/batchcreate.html.php | 4 +-- module/user/view/create.html.php | 2 +- module/user/view/login.html.php | 2 +- module/webhook/view/create.html.php | 2 +- module/webhook/view/edit.html.php | 2 +- 68 files changed, 106 insertions(+), 102 deletions(-) create mode 100644 db/update11.6.sql diff --git a/db/update11.6.sql b/db/update11.6.sql new file mode 100644 index 0000000000..9bfd776fa2 --- /dev/null +++ b/db/update11.6.sql @@ -0,0 +1,4 @@ +ALTER TABLE `zt_translation` +CHANGE `refer` `referer` text COLLATE 'utf8_general_ci' NOT NULL AFTER `value`, +CHANGE `translationTime` `translatedTime` datetime NOT NULL AFTER `translator`, +CHANGE `reviewTime` `reviewedTime` datetime NOT NULL AFTER `reviewer`; diff --git a/module/action/model.php b/module/action/model.php index 6110f54b6f..998dd55c7b 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1052,7 +1052,7 @@ class actionModel extends model foreach($actions as $action) { $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); - $date = common::checkEnLang() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp); + $date = common::checkNotCN() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp); $action->time = date(DT_TIME2, $timeStamp); $dateGroup[$date][] = $action; } diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php index fc653021d2..bf41720402 100644 --- a/module/admin/view/safe.html.php +++ b/module/admin/view/safe.html.php @@ -22,7 +22,7 @@
- + diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php index 0342d9137e..4e040d5cd9 100644 --- a/module/backup/view/index.html.php +++ b/module/backup/view/index.html.php @@ -36,7 +36,7 @@ - + diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index cbf39a4bce..4637747c69 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -20,7 +20,7 @@ - + diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 3a37fb83d9..56da2fa3e2 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -41,7 +41,7 @@ if(!$selfCall) die(include('./todolist.html.php')); '>

todo->create;?>

- +
diff --git a/module/branch/model.php b/module/branch/model.php index 2b5673fa27..238ab82aa5 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -46,7 +46,7 @@ class branchModel extends model $product = $this->loadModel('product')->getById($productID); if(!$product or $product->type == 'normal') return array(); - $space = common::checkEnLang() ? ' ' : ''; + $space = common::checkNotCN() ? ' ' : ''; $branches = array('0' => $this->lang->branch->all . $space . $this->lang->product->branchName[$product->type]) + $branches; } return $branches; @@ -107,7 +107,7 @@ class branchModel extends model } } - $space = common::checkEnLang() ? ' ' : ''; + $space = common::checkNotCN() ? ' ' : ''; foreach($products as $product) { if($product->type == 'normal') continue; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 7171f01633..7453a89eb2 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -116,7 +116,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow ?> - + " . $lang->bug->batchCreate, '', "class='btn btn-secondary'"); if(commonModel::isTutorialMode()) @@ -208,9 +208,9 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow { if($value->show) { - if(common::checkEnLang() and $value->id == 'severity') $value->name = $lang->bug->severity; - if(common::checkEnLang() and $value->id == 'pri') $value->name = $lang->bug->pri; - if(common::checkEnLang() and $value->id == 'confirmed') $value->name = $lang->bug->confirmed; + if(common::checkNotCN() and $value->id == 'severity') $value->name = $lang->bug->severity; + if(common::checkNotCN() and $value->id == 'pri') $value->name = $lang->bug->pri; + if(common::checkNotCN() and $value->id == 'confirmed') $value->name = $lang->bug->confirmed; $this->datatable->printHead($value, $orderBy, $vars); $columns ++; } diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 0f31932abe..f4e9e45967 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -212,7 +212,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
admin->safe->password?> admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?> admin->safe->noticeMode?>backup->time?> backup->files?> backup->size?> actions?>
project->name;?> project->end;?> statusAB;?> project->totalEstimate;?> project->totalConsumed;?>
- + @@ -266,7 +266,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
bug->openedBy;?> openedBy];?>
- + diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index 82c53c74fd..8060c52013 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -32,7 +32,7 @@ js::set('productID' , $bug->product);
bug->linkBug;?> createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?>
- + diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index b18b043245..7b11f510b8 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -102,7 +102,7 @@
- +
bug->resolution;?> bug->resolutionList, '', "class='form-control chosen' onchange=setDuplicate(this.value)");?>
@@ -271,7 +271,7 @@
- +
diff --git a/module/common/model.php b/module/common/model.php index 9f63cd4a6b..b0af0b2c0e 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1726,13 +1726,13 @@ EOD; } /** - * Check English Lang. + * Check Not CN Lang. * * @static * @access public * @return bool */ - public static function checkEnLang() + public static function checkNotCN() { global $app; return strpos('|zh-cn|zh-tw|', '|' . $app->getClientLang() . '|') === false; diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 7abb8f5025..b9c9aa75ce 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -40,7 +40,7 @@ $actions):?>
- + diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php index 7146bd2fdd..8c4ecb30c1 100644 --- a/module/custom/view/required.html.php +++ b/module/custom/view/required.html.php @@ -33,7 +33,7 @@
company->name;?> name, "class='form-control'");?>
- + $requiredField):?> diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 95bca4a0a4..686963ac20 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -54,7 +54,7 @@ EOT;
- + diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php index 979542ecd0..47336fe9fa 100644 --- a/module/dept/view/edit.html.php +++ b/module/dept/view/edit.html.php @@ -23,7 +23,7 @@ $jsRoot = $webRoot . "js/";
custom->storyReview;?> custom->reviewList, $needReview);?>
- + diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index fdebc613ae..5260240b8a 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -125,7 +125,7 @@
-
project->undone . (common::checkEnLang() ? ' ' : '') . (common::checkEnLang() ? "{$lang->projectCommon}s" : "$lang->projectCommon");?>
+
project->undone . (common::checkNotCN() ? ' ' : '') . (common::checkNotCN() ? "{$lang->projectCommon}s" : "$lang->projectCommon");?>
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 78e0f727e0..d2426215b9 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -12,7 +12,7 @@ if($this->methodName != 'browse') $moduleID = ''; } if(empty($type)) $type = 'product'; -$sideWidth = common::checkEnLang() ? '270' : '238'; +$sideWidth = common::checkNotCN() ? '270' : '238'; ?>
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index c31b8e3dd9..99bf7c52bf 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -21,7 +21,7 @@
dept->parent;?> parent, "class='form-control chosen'");?>
- + '> - +
group->viewList;?> menu as $menuKey => $menu):?> diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 56f0a454be..237a6bca79 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -26,7 +26,7 @@
my->common;?>
@@ -73,7 +73,7 @@ - + @@ -98,7 +98,7 @@ } ?> '> - +
group->module;?> group->method;?>
diff --git a/module/mail/view/index.html.php b/module/mail/view/index.html.php index 42c0761a0c..39acf727ec 100755 --- a/module/mail/view/index.html.php +++ b/module/mail/view/index.html.php @@ -21,7 +21,7 @@
- + mail->ztCloud, '', "class='btn w-120px'")?> diff --git a/module/message/css/setting.css b/module/message/css/setting.css index 9279a6ca13..e4fcb9af50 100644 --- a/module/message/css/setting.css +++ b/module/message/css/setting.css @@ -1,6 +1,6 @@ .checkbox-primary + .checkbox-primary {margin:0px;} .checkbox-primary {margin:0px; margin-right:10px !important; width:120px;display:inline-block} -.checkbox-primary label{white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.checkbox-primary label{white-space:nowrap; overflow:visible; text-overflow:ellipsis;} div.chosen-container + select + div.chosen-container > .chosen-choices {border-top:0px;} .table-bordered thead .checkbox-primary{width:200px;} diff --git a/module/message/model.php b/module/message/model.php index 2ac554a8f9..693328dbe4 100644 --- a/module/message/model.php +++ b/module/message/model.php @@ -123,7 +123,7 @@ class messageModel extends model if($toList == $this->app->user->account) return false; $moduleName = $objectType == 'case' ? 'testcase' : $objectType; - $space = common::checkEnLang() ? ' ' : ''; + $space = common::checkNotCN() ? ' ' : ''; $data = $this->app->user->realname . $space . $this->lang->action->label->$actionType . $space . $this->lang->action->objectTypes[$objectType]; $data .= ' ' . html::a(helper::createLink($moduleName, 'view', "id=$objectID"), "[#{$objectID}::{$object->$field}]"); diff --git a/module/misc/view/changelog.html.php b/module/misc/view/changelog.html.php index 9a0d9c68df..efd3275072 100644 --- a/module/misc/view/changelog.html.php +++ b/module/misc/view/changelog.html.php @@ -28,7 +28,7 @@ - +
misc->feature->detailed;?>
diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php index e9f57df1e7..77c77b9399 100755 --- a/module/my/view/changepassword.html.php +++ b/module/my/view/changepassword.html.php @@ -22,7 +22,7 @@
- + diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 1524ef79a8..08a961202e 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -84,7 +84,7 @@ ?> - + createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID"), " {$lang->story->batchCreate}", '', "class='btn btn btn-secondary'");?> $actions):?>
-
year) : '');?>
+
year) : '');?>
product->iterationInfo, count($groupRoadmaps, 1) - count($groupRoadmaps));?>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 4d922a3a63..d0b2dab052 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -200,7 +200,7 @@
user->account;?> account . html::hidden('account',$user->account);?>
- + diff --git a/module/project/control.php b/module/project/control.php index 4c4ba81e6e..c5156ad056 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -902,7 +902,7 @@ class project extends control $chartData = $this->project->buildBurnData($projectID, $dateList, $type); /* Set a space when assemble the string for english. */ - $space = common::checkEnLang() ? ' ' : ''; + $space = common::checkNotCN() ? ' ' : ''; $dayList = array_fill(1, floor($project->days / $this->config->project->maxBurnDay) + 5, ''); foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . $space . ($key + 1) . $space . $this->lang->day; diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index 8542e3235f..90c8cd7d90 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -40,7 +40,7 @@ - + diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php index a44c4938b5..e4fc832057 100644 --- a/module/project/view/burn.html.php +++ b/module/project/view/burn.html.php @@ -27,7 +27,7 @@ echo $lang->project->howToUpdateBurn; ?> -
+
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php index e6c2eb8a35..66cf4d87b1 100755 --- a/module/project/view/dynamic.html.php +++ b/module/project/view/dynamic.html.php @@ -67,7 +67,7 @@ $actions):?> project = $projectID; ?> - + createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')); if(common::hasPriv('task', 'batchCreate', $checkObject)) echo html::a($link, " {$lang->task->batchCreate}", '', "class='btn btn btn-secondary'"); diff --git a/module/project/view/treestory.html.php b/module/project/view/treestory.html.php index b4f00dcc42..f5df5df76d 100644 --- a/module/project/view/treestory.html.php +++ b/module/project/view/treestory.html.php @@ -196,7 +196,7 @@
story->statusList['active'] . $space . $lang->story->common;?> stories['active']?> project->name);?> project->code);?> project->PM);?> project->end);?> project->status);?>
- + global->flow != 'onlyStory'):?> diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php index 6bc2dd6949..26f9a73bc9 100644 --- a/module/report/view/bugassign.html.php +++ b/module/report/view/bugassign.html.php @@ -4,7 +4,7 @@
- PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  report->proVersionEn : $lang->report->proVersion; ?>
diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php index 53e7292ed1..123bc907fd 100644 --- a/module/report/view/bugcreate.html.php +++ b/module/report/view/bugcreate.html.php @@ -5,7 +5,7 @@
- PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  report->proVersionEn : $lang->report->proVersion; ?>
diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php index 8822138ec1..a1d571d7d1 100644 --- a/module/report/view/productsummary.html.php +++ b/module/report/view/productsummary.html.php @@ -1,5 +1,5 @@ - +
@@ -7,7 +7,7 @@
- PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  report->proVersionEn : $lang->report->proVersion; ?>
diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php index 40ef7c9be4..dcb6b4a90a 100644 --- a/module/report/view/projectdeviation.html.php +++ b/module/report/view/projectdeviation.html.php @@ -6,7 +6,7 @@
- PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  report->proVersionEn : $lang->report->proVersion; ?>
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php index 28e77db34e..f627faf12f 100644 --- a/module/report/view/workload.html.php +++ b/module/report/view/workload.html.php @@ -5,7 +5,7 @@
- PRO  report->proVersionEn : $lang->report->proVersion; ?> + PRO  report->proVersionEn : $lang->report->proVersion; ?>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index b23e58def0..9b09f5e407 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -15,8 +15,8 @@ $jsRoot = $this->app->getWebRoot() . "js/"; include '../../common/view/datepicker.html.php'; include '../../common/view/chosen.html.php'; $formId = 'searchForm-' . uniqid(''); -$fieldWidth = common::checkEnLang() ? 'w-130px' : 'w-110px'; -$operatorWidth = common::checkEnLang() ? 'w-110px' : 'w-90px'; +$fieldWidth = common::checkNotCN() ? 'w-130px' : 'w-110px'; +$operatorWidth = common::checkNotCN() ? 'w-110px' : 'w-90px'; ?>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index a95ef0de5c..3fb5903ee9 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -67,7 +67,7 @@
story->legendBasicInfo;?>
- + - + diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index 5ffb7c0650..c86198a4bd 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -27,7 +27,7 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri
story->product;?>
@@ -210,7 +210,7 @@
>story->linkStories;?> createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?>
- + diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 3ecd264244..aa10740f5f 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -232,7 +232,7 @@
story->reviewedDate;?>
- + @@ -314,7 +314,7 @@
- +
global->flow != 'onlyStory'):?> diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index fe7f4312cd..8039ed1cb5 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -32,7 +32,7 @@ - + diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php index 52c9ecd1ca..53c5018c63 100644 --- a/module/task/view/activate.html.php +++ b/module/task/view/activate.html.php @@ -27,7 +27,7 @@
priAB);?> story->title);?> story->planAB);?> story->source);?> openedByAB);?> assignedToAB);?>
- + diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 09e99811e3..ef15ce34d9 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -20,7 +20,7 @@ task->confirmChangeProject);?> team) < 6 ? 6 - count($task->team) : 1);?> - +
@@ -177,7 +177,7 @@
task->legendLife;?>
- +
task->assignedTo;?> finishedBy, "class='form-control chosen'");?>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index 651c97f211..fb3fa41dd9 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -35,7 +35,7 @@
>task->openedBy;?>
- + diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index bf5b3e2d3a..6b15993338 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -24,7 +24,7 @@ team);?> assignedTo != end($team)) ? $lang->task->confirmTransfer : $lang->task->confirmRecord);?> task->noticeSaveRecord);?> - +
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index c18e939064..2715f27be8 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -288,7 +288,7 @@
team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?> consumed;?> workingHour;?>
- + @@ -344,7 +344,7 @@ task->legendEffort;?>
task->openedBy;?>
- + diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 1dd2c5699a..647cdd2f01 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -119,7 +119,7 @@ - + testcase->legendBasicInfo;?>
- +
task->estimate;?> estimate . $lang->workingHour;?>
@@ -276,7 +276,7 @@
testcase->legendLinkBugs;?>
- +
fromBug):?> @@ -306,7 +306,7 @@
testcase->legendOpenAndEdit;?>
- +
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php index f86c9bb7de..7e4de03a36 100644 --- a/module/todo/view/create.html.php +++ b/module/todo/view/create.html.php @@ -22,7 +22,7 @@
testcase->openedBy;?>
- + diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php index 9dbfa6ee89..1b0fc626f4 100644 --- a/module/todo/view/edit.html.php +++ b/module/todo/view/edit.html.php @@ -13,7 +13,7 @@ - +
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index a711a266a7..d9eb3bbcb6 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -93,7 +93,7 @@
todo->date;?>
@@ -76,7 +76,7 @@
-
; padding-top:5px;'> +
; padding-top:5px;'> todo->beforeDays, html::input('config[beforeDays]', 0, "class='form-control'"));?>
- + @@ -137,7 +137,7 @@
todo->pri;?> pri;?>' title='todo->priList, $todo->pri, $todo->pri);?>'>todo->priList, $todo->pri)?>
- + diff --git a/module/translate/control.php b/module/translate/control.php index 4d49efd32d..ec9374e2c2 100644 --- a/module/translate/control.php +++ b/module/translate/control.php @@ -259,7 +259,7 @@ class translate extends control { if($result == 'pass') { - $this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewTime')->eq(helper::now())->where('id')->eq($translationID)->exec(); + $this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewedTime')->eq(helper::now())->where('id')->eq($translationID)->exec(); die(js::reload()); } if($result == 'reject' and empty($_POST)) die($this->display()); @@ -267,7 +267,7 @@ class translate extends control { $data = fixer::input('post')->get(); if(empty($data->reason)) $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->error->notempty, $this->lang->translate->reason))); - $this->dao->update(TABLE_TRANSLATION)->set('status')->eq('rejected')->set('reviewer')->eq($this->app->user->account)->set('reviewTime')->eq(helper::now())->set('reason')->eq($data->reason)->where('id')->eq($translationID)->exec(); + $this->dao->update(TABLE_TRANSLATION)->set('status')->eq('rejected')->set('reviewer')->eq($this->app->user->account)->set('reviewedTime')->eq(helper::now())->set('reason')->eq($data->reason)->where('id')->eq($translationID)->exec(); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.reloadStatus($translationID)")); } } @@ -280,7 +280,7 @@ class translate extends control */ public function batchPass() { - $this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewTime')->eq(helper::now())->where('id')->in($this->post->idList)->exec(); + $this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewedTime')->eq(helper::now())->where('id')->in($this->post->idList)->exec(); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload')); } diff --git a/module/translate/model.php b/module/translate/model.php index cd96aa86b2..fc2b70e49f 100644 --- a/module/translate/model.php +++ b/module/translate/model.php @@ -71,11 +71,11 @@ class translateModel extends model $translation->module = $moduleName; $translation->key = $key; $translation->value = $value; - $translation->refer = htmlspecialchars($translation->value); + $translation->referer = htmlspecialchars($translation->value); $translation->status = 'waiting'; $translation->version = $this->config->version; $translation->translator = $this->app->user->account; - $translation->translationTime = $now; + $translation->translatedTime = $now; $translation->mode = $flow; $this->dao->replace(TABLE_TRANSLATION)->data($translation)->exec(); } @@ -354,10 +354,10 @@ class translateModel extends model if($dbItem->value != $value) { $translation->value = $value; - $translation->refer = $refer; + $translation->referer = $refer; $translation->status = 'translated'; $translation->translator = $this->app->user->account; - $translation->translationTime = $now; + $translation->translatedTime = $now; if($translation->reason) $translation->reason = ''; } elseif(!empty($_POST['values'][$i]) and strpos("waiting|changed", $translation->status) !== false) @@ -372,10 +372,10 @@ class translateModel extends model $translation->module = $module; $translation->key = $key; $translation->value = $value; - $translation->refer = $refer; + $translation->referer = $refer; $translation->status = 'translated'; $translation->translator = $this->app->user->account; - $translation->translationTime = $now; + $translation->translatedTime = $now; $translation->version = $this->config->version; $translation->mode = $flow; } @@ -435,8 +435,8 @@ class translateModel extends model { $translators[$translation->translator] = $translation->translator; $reviewers[$translation->reviewer] = $translation->reviewer; - if(empty($lastReviewTime)) $lastReviewTime = $translation->reviewTime; - if($lastReviewTime < $translation->reviewTime) $lastReviewTime = $translation->reviewTime; + if(empty($lastReviewTime)) $lastReviewTime = $translation->reviewedTime; + if($lastReviewTime < $translation->reviewedTime) $lastReviewTime = $translation->reviewedTime; } } @@ -697,10 +697,10 @@ class translateModel extends model $translation->module = $moduleName; $translation->key = $langKey; $translation->value = $langValue; - $translation->refer = htmlspecialchars($langValue); + $translation->referer = htmlspecialchars($langValue); $translation->status = 'waiting'; $translation->translator = $this->app->user->account; - $translation->translationTime = helper::now(); + $translation->translatedTime = helper::now(); $translation->version = $version; $translation->mode = $flow; $this->dao->replace(TABLE_TRANSLATION)->data($translation)->exec(); @@ -709,13 +709,13 @@ class translateModel extends model { if(!isset($translateIdList[$translation->id])) continue; $specialedValue = htmlspecialchars($langValue); - if($specialedValue == $translation->refer) + if($specialedValue == $translation->referer) { $this->dao->update(TABLE_TRANSLATION)->set('version')->eq($version)->where('id')->eq($translation->id)->exec(); } - elseif($specialedValue != $translation->refer) + elseif($specialedValue != $translation->referer) { - $this->dao->update(TABLE_TRANSLATION)->set('version')->eq($version)->set('status')->eq('changed')->set('refer')->eq($specialedValue)->where('id')->eq($translation->id)->exec(); + $this->dao->update(TABLE_TRANSLATION)->set('version')->eq($version)->set('status')->eq('changed')->set('referer')->eq($specialedValue)->where('id')->eq($translation->id)->exec(); } unset($translateIdList[$translation->id]); } diff --git a/module/translate/view/choosemodule.html.php b/module/translate/view/choosemodule.html.php index 1384b4e9f6..1001866d7a 100644 --- a/module/translate/view/choosemodule.html.php +++ b/module/translate/view/choosemodule.html.php @@ -33,7 +33,7 @@ translate->needReview):?> - + diff --git a/module/translate/view/index.html.php b/module/translate/view/index.html.php index b0fa00658c..7aaf8ec116 100644 --- a/module/translate/view/index.html.php +++ b/module/translate/view/index.html.php @@ -48,7 +48,7 @@ -
todo->beginAndEnd?> config->begin . " ~ " . $todo->config->end;?>
translate->reviewedProgress;?> '>actions;?>'>actions;?>
name;?> translate->progress, ($data->progress * 100) . '%');?>'> + '> translate->common, '', "class='btn btn-sm $disabled'"); echo html::a(inlink('export', "language=$langKey"), $lang->export, '', "class='btn btn-sm iframe $disabled'"); diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index 7b84a861ac..5b489ad577 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -23,7 +23,7 @@ js::set('type', $type);
- + diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 659dee06fa..6da8b42c66 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -37,13 +37,13 @@ - + - + diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 2fd57ac03c..52b7820be4 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -23,7 +23,7 @@
tree->product;?>
idAB;?> '>user->dept;?> user->account;?> user->realname;?> user->role;?> user->group;?> '>user->email;?> '>user->gender;?> user->password;?> '>user->commiter;?>
- + diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 26dba70ef6..90f566a791 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -27,7 +27,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
- +
diff --git a/module/webhook/view/create.html.php b/module/webhook/view/create.html.php index 84bdb9cbe5..77867e7ff6 100644 --- a/module/webhook/view/create.html.php +++ b/module/webhook/view/create.html.php @@ -21,7 +21,7 @@
user->dept;?>
- + diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php index 5980aefff3..04ace3c616 100644 --- a/module/webhook/view/edit.html.php +++ b/module/webhook/view/edit.html.php @@ -20,7 +20,7 @@
webhook->type;?> webhook->typeList, '', "class='form-control'");?>
- +
webhook->type;?> webhook->typeList, $webhook->type, "class='form-control'");?>