From 2d9221becae2a25cbf3a1c4d827e1c27ea4e1533 Mon Sep 17 00:00:00 2001 From: JackWuLieHao Date: Thu, 29 Mar 2018 11:18:33 +0800 Subject: [PATCH 1/8] *Add user creation, edit, and view the details of the page without the date of entry display --- module/common/view/header.lite.html.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index 022b92a385..98d721829b 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -16,7 +16,6 @@ $clientTheme = $this->app->getClientTheme(); zentaoPMS); - js::exportConfigVars(); if($config->debug) { From 7719686ae28642fb2dfe585fe6932f012ae76893 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 29 Mar 2018 13:24:26 +0800 Subject: [PATCH 2/8] * Adjust codes. --- db/update9.8.2.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/update9.8.2.sql b/db/update9.8.2.sql index ae6e524018..f4fa1b6dc5 100644 --- a/db/update9.8.2.sql +++ b/db/update9.8.2.sql @@ -1,2 +1,2 @@ -ALTER TABLE `zt_team` DROP PRIMARY KEY, -ADD PRIMARY KEY (`root`,`type`,`account`); +ALTER TABLE `zt_team` DROP PRIMARY KEY; +ALTER TABLE `zt_team` ADD PRIMARY KEY (`root`, `type`, `account`); From 48c255f2361bce74f299518a405608179557171c Mon Sep 17 00:00:00 2001 From: JackWuLieHao Date: Thu, 29 Mar 2018 13:31:24 +0800 Subject: [PATCH 3/8] * Modify the installed button style --- module/extension/view/obtain.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php index 705ff316d1..0d58ec8504 100644 --- a/module/extension/view/obtain.html.php +++ b/module/extension/view/obtain.html.php @@ -105,7 +105,7 @@ } else { - echo html::commonButton(" " . $lang->extension->installed, "disabled='disabled'", 'text-success'); + echo html::commonButton(" " . $lang->extension->installed, "disabled='disabled' style='height:34px;'", 'text-success'); } } else From 893fef2eafc7aced0edc4200444bb120f8eb9230 Mon Sep 17 00:00:00 2001 From: JackWuLieHao Date: Thu, 29 Mar 2018 13:34:44 +0800 Subject: [PATCH 4/8] * international version of the page, column width less --- module/my/view/todo.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 9da580c8fd..9aa1db6434 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -52,7 +52,7 @@ idAB);?> todo->date);?> todo->type);?> - priAB);?> + priAB);?> todo->name);?> todo->beginAB);?> todo->endAB);?> From 34e25dc140b5cf1b424c2751838cc339f8f8a917 Mon Sep 17 00:00:00 2001 From: JackWuLieHao Date: Thu, 29 Mar 2018 13:37:05 +0800 Subject: [PATCH 5/8] *Repair can not be imported due to a single space in the code --- module/story/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/control.php b/module/story/control.php index cd47d513af..429b928d68 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1462,7 +1462,7 @@ class story extends control foreach(explode(',', $story->plan) as $planID) { if(empty($planID)) continue; - if(isset($relatedPlans[$planID]))$plans .= $relatedPlans[$planID] . "(#$planID) "; + if(isset($relatedPlans[$planID]))$plans .= $relatedPlans[$planID] . "(#$planID)"; } $story->plan = $plans; } From 77ed3e4dec63cfbe0c46b2e3c57dd4ca33ba8b5a Mon Sep 17 00:00:00 2001 From: JackWuLieHao Date: Thu, 29 Mar 2018 13:42:12 +0800 Subject: [PATCH 6/8] *Add the user add, edit, and view the details of the page without the *date of hire display --- module/user/js/create.js | 4 ++++ module/user/model.php | 2 +- module/user/view/create.html.php | 4 ++++ module/user/view/edit.html.php | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/module/user/js/create.js b/module/user/js/create.js index 0adc074c5c..44e71e3161 100644 --- a/module/user/js/create.js +++ b/module/user/js/create.js @@ -10,3 +10,7 @@ function changeGroup(role) } $('#group').trigger("chosen:updated"); } +/* + 设置用户的入职日期,默认为当天 +*/ +document.getElementById('join').value = new Date().format("yyyy-MM-dd"); diff --git a/module/user/model.php b/module/user/model.php index 9f1975e0ed..7eb37538d1 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -210,7 +210,7 @@ class userModel extends model if(strtolower($_POST['account']) == 'guest') return false; $user = fixer::input('post') - ->setDefault('join', '0000-00-00') + ->setDefault('join', $this->post->join) ->setIF($this->post->password1 != false, 'password', md5($this->post->password1)) ->setIF($this->post->password1 == false, 'password', '') ->setIF($this->post->email != false, 'email', trim($this->post->email)) diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index d9a0a506ab..7783e4fd37 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -51,6 +51,10 @@ user->password2;?> + + user->join;?> + + user->role;?> user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?> diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 80a5c33c43..0d4f567b6b 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -34,6 +34,10 @@ user->role;?> user->roleList, $user->role, "class='form-control'");?> + + user->join;?> + + group->priv;?> From 960ec7c84cdce937cc7b7f7d0d2c49bbf4545e85 Mon Sep 17 00:00:00 2001 From: JackWuLieHao Date: Thu, 29 Mar 2018 15:39:14 +0800 Subject: [PATCH 7/8] * Finish task #3797 --- module/user/js/create.js | 4 ---- module/user/view/create.html.php | 2 +- module/user/view/edit.html.php | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/module/user/js/create.js b/module/user/js/create.js index 44e71e3161..0adc074c5c 100644 --- a/module/user/js/create.js +++ b/module/user/js/create.js @@ -10,7 +10,3 @@ function changeGroup(role) } $('#group').trigger("chosen:updated"); } -/* - 设置用户的入职日期,默认为当天 -*/ -document.getElementById('join').value = new Date().format("yyyy-MM-dd"); diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 7783e4fd37..24358a289a 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -53,7 +53,7 @@ user->join;?> - + user->role;?> diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 0d4f567b6b..8f9713f6b3 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -36,7 +36,7 @@ user->join;?> - + join, "class='form-control form-date'");?> group->priv;?> From 65d8752b5eba626ec13e673d480081437a9fd156 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 29 Mar 2018 15:39:53 +0800 Subject: [PATCH 8/8] * fix for import case in testsuite. --- module/common/model.php | 1 - module/testsuite/model.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 8f3a86d4b6..0efd93af30 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -922,7 +922,6 @@ class commonModel extends model $queryCondition = $this->session->$queryCondition; $orderBy = $type . 'OrderBy'; $orderBy = $this->session->$orderBy; - $orderBy = str_replace('`left`', 'left', $orderBy); // process the `left` to left. if(empty($queryCondition) or $this->session->$typeOnlyCondition) { diff --git a/module/testsuite/model.php b/module/testsuite/model.php index 1aab5b1ed9..0f4f902ee6 100644 --- a/module/testsuite/model.php +++ b/module/testsuite/model.php @@ -688,8 +688,8 @@ class testsuiteModel extends model if($stepData->type == 'step') $parentStepID = 0; } } - $oldCase->steps = $this->joinStep($oldStep); - $caseData->steps = $this->joinStep($steps); + $oldCase->steps = $this->testcase->joinStep($oldStep); + $caseData->steps = $this->testcase->joinStep($steps); $changes = common::createChanges($oldCase, $caseData); $actionID = $this->action->create('case', $caseID, 'Edited'); $this->action->logHistory($actionID, $changes);