From 0112ba79f9909557a88c5c18f37560d28f4bd761 Mon Sep 17 00:00:00 2001 From: zhubaoxin <472455206@qq.com> Date: Tue, 8 Aug 2017 17:45:25 +0800 Subject: [PATCH 1/7] * Fix Bug #1179. --- module/testtask/css/cases.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module/testtask/css/cases.css b/module/testtask/css/cases.css index 4a5669d4f4..902a7fe6ca 100644 --- a/module/testtask/css/cases.css +++ b/module/testtask/css/cases.css @@ -2,6 +2,9 @@ tbody > tr > td > .btn-icon {margin-right: 3px;} tbody > tr > td .icon-bug {margin-left: -8px;} tfoot .table-actions #assignedTo_chosen a.chosen-default{height:26px;line-height:15px} -tfoot .table-actions .input-group-addon{padding:5px 12px;} +tfoot .table-actions .input-group-addon{padding:4px 12px;} tfoot.fixedTfootAction .chosen-results li.active-result {color: black;} +tfoot .table-actions .input-group #assignedTo_chosen .chosen-single{height:24px;padding:3px 6px} +tfoot .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;} +tfoot .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;} From 78898d425e955405c49d7b6f96220c52c0ad953d Mon Sep 17 00:00:00 2001 From: zhubaoxin <472455206@qq.com> Date: Tue, 8 Aug 2017 17:55:52 +0800 Subject: [PATCH 2/7] * Fix Bug #1178. --- module/report/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/report/model.php b/module/report/model.php index 3984037229..502c933e66 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -261,7 +261,7 @@ class reportModel extends model ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account') ->where('t1.deleted')->eq(0) - ->andWhere('t1.status')->notin('cancel, closed, done') + ->andWhere('t1.status')->notin('cancel, closed, done, pause') ->andWhere('t2.deleted')->eq(0) ->andWhere('t2.status')->notin('cancel, closed, done') ->beginIF($dept)->andWhere('t3.dept')->in($depts)->fi() From 5d2796ef23679c149429d85976369bf6f888f8c4 Mon Sep 17 00:00:00 2001 From: zhubaoxin <472455206@qq.com> Date: Tue, 8 Aug 2017 17:58:46 +0800 Subject: [PATCH 3/7] * Fix Bug #1176 and #1175. --- module/doc/view/showfiles.html.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php index 159bcb93b1..06410948cc 100644 --- a/module/doc/view/showfiles.html.php +++ b/module/doc/view/showfiles.html.php @@ -49,8 +49,13 @@ $imageSize = getimagesize($file->realPath); $imageWidth = $imageSize ? $imageSize[0] : 0; } + + $sessionString = $config->requestType == 'PATH_INFO' ? '?' : '&'; + $sessionString .= session_name() . '=' . session_id(); + $fileID = $file->id; + $url = helper::createLink('file', 'download', 'fileID=' . $fileID) . $sessionString ; ?> - extension?>' target='_blank' onclick="return downloadFile(id?>, 'extension?>', )"> + extension?>' target='_blank' onclick="return downloadFile(id?>, 'extension?>', )"> createLink('file', 'download', "fileID=$file->id&mouse=left"); if(in_array($file->extension, $config->file->imageExtensions)) From f0d3eb33291e88eb250460c456eda6643b01443d Mon Sep 17 00:00:00 2001 From: zhubaoxin <472455206@qq.com> Date: Tue, 8 Aug 2017 18:02:03 +0800 Subject: [PATCH 4/7] * Fix Bug #1171. --- module/doc/css/objectlibs.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css index 2af3b9d879..f5447248f7 100644 --- a/module/doc/css/objectlibs.css +++ b/module/doc/css/objectlibs.css @@ -2,3 +2,4 @@ .addbtn{padding-top:22px;height:63px; border:1px dashed #ddd; width:60px;} .addbtn .icon-plus {font-size: 18px; display: block; opacity: 0.5; transition: opacity .2s; text-shadow: 1px 1px 3px rgba(0,0,0,.2);} .addbtn:hover .icon-plus {opacity: .9; animation: flash-icon 1s linear alternate infinite} +#dropMenu{min-width:250px;padding:10px 15px;box-sizing:inhert;} From 34cd31b93ba957ca2d08f01d562947fbe5bd7444 Mon Sep 17 00:00:00 2001 From: zhubaoxin <472455206@qq.com> Date: Tue, 8 Aug 2017 18:03:36 +0800 Subject: [PATCH 5/7] * Fix Bug #1162. --- module/testtask/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/testtask/control.php b/module/testtask/control.php index 0d2fd98544..b96dea600a 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -264,6 +264,7 @@ class testtask extends control $this->config->testcase->search['params']['product']['values'] = array($productID => $this->products[$productID], 'all' => $this->lang->testcase->allProduct); $this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case'); + $this->config->testcase->search['queryID'] = $queryID; $this->config->testcase->search['fields']['assignedTo'] = $this->lang->testtask->assignedTo; $this->config->testcase->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $this->config->testcase->search['actionURL'] = inlink('cases', "taskID=$taskID&browseType=bySearch&queryID=myQueryID"); From 24a0ed150ef3e9b9186585eac07d21281cd25748 Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Fri, 11 Aug 2017 11:03:11 +0800 Subject: [PATCH 6/7] * Fix bug #1189. --- module/cron/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/cron/model.php b/module/cron/model.php index fab061af6c..26ad7dfc15 100644 --- a/module/cron/model.php +++ b/module/cron/model.php @@ -219,7 +219,7 @@ class cronModel extends model if($cron->h === '' or preg_match('/[^0-9\*\-\/]/', $cron->h)) return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->h); if($cron->dom === '' or preg_match('/[^0-9\*\-\/]/', $cron->dom))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->dom); if($cron->mon === '' or preg_match('/[^0-9\*\-\/]/', $cron->mon))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->mon); - if($cron->dow === '' or preg_match('/[^0-9\*\-\/]/', $cron->dow))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->dow); + if($cron->dow === '' or preg_match('/[^0-9\*\-|,\/]/', $cron->dow))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->dow); if(empty($cron->command))return sprintf($this->lang->error->notempty, $this->lang->cron->command); return null; } From 2d17fc78ece5280d2f068407d0269b909e371793 Mon Sep 17 00:00:00 2001 From: pengjiangxiu Date: Fri, 11 Aug 2017 14:36:47 +0800 Subject: [PATCH 7/7] * Finish task #3169. --- module/my/view/managecontacts.html.php | 10 ++++++---- module/user/model.php | 23 +++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php index 27b9883fec..2f0f1ff76e 100644 --- a/module/my/view/managecontacts.html.php +++ b/module/my/view/managecontacts.html.php @@ -41,23 +41,25 @@ - + -
user->contacts->listName;?> + +
listName, "class='form-control w-300px'"); + echo html::input('listName', $list->listName, "class='form-control'"); echo html::hidden('listID', $list->id); } ?>
user->contacts->selectedUsers;?> + userList = join(',', $userList); $data->account = $this->app->user->account; - $this->dao->insert(TABLE_USERCONTACT)->data($data)->exec(); + if(empty($data->listName)) + { + dao::$errors['listName'][] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName); + die(js::error(dao::getError())); + } + + $this->dao->insert(TABLE_USERCONTACT)->data($data) + ->autoCheck() + ->exec(); + if(dao::isError()) die(js::error(dao::getError())); + return $this->dao->lastInsertID(); } @@ -955,7 +965,16 @@ class userModel extends model $data->listName = $listName; $data->userList = join(',', $userList); - $this->dao->update(TABLE_USERCONTACT)->data($data)->where('id')->eq($listID)->exec(); + if(empty($data->listName)) + { + dao::$errors['listName'][] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName); + die(js::error(dao::getError())); + } + + $this->dao->update(TABLE_USERCONTACT)->data($data) + ->where('id')->eq($listID) + ->exec(); + if(dao::isError()) die(js::error(dao::getError())); } /**