diff --git a/module/block/control.php b/module/block/control.php index 7cf9174997..7af7fdf698 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1515,8 +1515,9 @@ class block extends control $status = isset($this->params->type) ? $this->params->type : ''; $count = isset($this->params->count) ? (int)$this->params->count : 0; - $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0; - $products = $this->loadModel('product')->getOrderedProducts($status, $count, $projectID); + $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0; + $products = $this->loadModel('product')->getOrderedProducts($status, $count, $projectID); + $executions = $this->loadModel('execution')->getPairs($projectID, 'all', 'empty|withdelete'); if(empty($products)) { $this->view->products = $products; @@ -1536,6 +1537,7 @@ class block extends control count((closedDate >= '$yesterday' and closedDate < '$today') or null) as yesterdayClosed") ->from(TABLE_BUG) ->where('product')->in($productIdList) + ->andWhere('execution')->in(array_keys($executions)) ->andWhere('deleted')->eq(0) ->groupBy('product') ->fetchAll('product'); diff --git a/module/bug/config.php b/module/bug/config.php index 680b102b1e..087cb3799a 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -36,7 +36,7 @@ $config->bug->list->exportFields = 'id, product, branch, module, project, execut duplicateBug, linkBug, case, lastEditedBy, - lastEditedDate, files'; + lastEditedDate, files ,feedbackBy, notifyEmail'; if($config->systemMode == 'classic') $config->bug->list->exportFields = str_replace(' project,', '', $config->bug->list->exportFields); $config->bug->list->customCreateFields = 'execution,noticefeedbackBy,story,task,pri,severity,os,browser,deadline,mailto,keywords'; diff --git a/module/common/model.php b/module/common/model.php index 84e5c5c888..32d94992e5 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1472,7 +1472,11 @@ class commonModel extends model $orderBy = "" . trim($fieldName, '`') . "" . '_' . 'asc'; $className = 'header'; } - $link = helper::createLink($module, $method, sprintf($vars, $orderBy)); + + $params = sprintf($vars, $orderBy); + if($app->getModuleName() == 'my') $params = "mode={$app->getMethodName()}&" .sprintf($vars, $orderBy); + + $link = helper::createLink($module, $method, $params); echo $isMobile ? html::a($link, $label, '', "class='$className' data-app={$app->tab}") : html::a($link, $label, '', "class='$className' data-app={$app->tab}"); } diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index b07da8587d..44b3af8cfe 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -7,6 +7,7 @@ diff --git a/module/execution/view/storykanban.html.php b/module/execution/view/storykanban.html.php index 1a5ddd18ed..10dce6e821 100644 --- a/module/execution/view/storykanban.html.php +++ b/module/execution/view/storykanban.html.php @@ -11,10 +11,20 @@ execution->confirmUnlinkStory)?> +app->user->account; +?> -app->user->account; -?>
diff --git a/module/kanban/js/common.js b/module/kanban/js/common.js index 8b602a5482..7537e5215e 100644 --- a/module/kanban/js/common.js +++ b/module/kanban/js/common.js @@ -14,6 +14,7 @@ function setMailto(field, value) $('#team').replaceWith(data); $('#team_chosen').remove(); $('#team').chosen(); + $('.picker.picker-multi').remove(); }) } diff --git a/module/my/control.php b/module/my/control.php index 8fac7b1941..0861c28899 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -1169,7 +1169,7 @@ EOF; * @access public * @return void */ - public function manageContacts($listID = 0, $mode = '') + public function manageContacts($listID = 0, $mode = 'new') { if($_POST) { @@ -1191,7 +1191,7 @@ EOF; } $this->user->setGlobalContacts($listID, isset($data->share)); if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.parent.ajaxGetContacts('#mailto')")); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('manageContacts', "listID=$listID"))); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('manageContacts', "listID=$listID&mode=edit"))); } elseif($data->mode == 'edit') { @@ -1208,7 +1208,7 @@ EOF; return $this->send($response); } - $response['locate'] = inlink('manageContacts', "listID=$listID"); + $response['locate'] = inlink('manageContacts', "listID=$listID&mode=edit"); return $this->send($response); } } @@ -1231,7 +1231,6 @@ EOF; } $listID = $listID ? $listID : key($lists); - if(!$listID) $mode = 'new'; /* Create or manage list according to mode. */ if($mode == 'new') diff --git a/module/my/css/managecontacts.css b/module/my/css/managecontacts.css index 82c80117ae..ba5a1455e6 100644 --- a/module/my/css/managecontacts.css +++ b/module/my/css/managecontacts.css @@ -1,3 +1,6 @@ body.body-modal {padding-bottom: 20px; min-height: 400px;} -.side-col {padding-right: 40px; padding-top: 25px;} +.side-col {padding-right: 40px;} .btn-block {display: block; width: 100%; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;} +.contactListTitle {margin-left: 45px !important;} +.createBtn {width: 100%; margin-bottom: 5px;} +.main-col .main-header .title {margin-left: 17px !important;} diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 5ea1688567..66e1068d95 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -45,6 +45,7 @@ $lang->my->pri = 'Priority'; $lang->my->alert = 'You can click on your profile at the top right and select "Preference" to modify your information. '; $lang->my->assignedToMe = 'AssignedToMe'; $lang->my->byQuery = 'Search'; +$lang->my->contactList = 'Contact List'; $lang->my->indexAction = 'My Index'; $lang->my->calendarAction = 'My Calendar'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index b1c3471f89..3c168dab0f 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -45,6 +45,7 @@ $lang->my->pri = '优先级'; $lang->my->alert = '后续您可以点击右上方的头像，选择“个性化设置”修改信息。'; $lang->my->assignedToMe = '指派给我'; $lang->my->byQuery = '搜索'; +$lang->my->contactList = '联系人列表'; $lang->my->indexAction = '地盘仪表盘'; $lang->my->calendarAction = '我的日程'; diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php index 4f395908f8..7c2c6e65ba 100644 --- a/module/my/view/managecontacts.html.php +++ b/module/my/view/managecontacts.html.php @@ -11,27 +11,28 @@ */ ?> -
'> - +
+

my->contactList;?>

+
+ ' . $lang->user->contacts->createList, '', "class='btn btn-secondary createBtn'"); ?> $listName) { - $listClass = ($id == $listID) ? 'btn btn-block active' : 'btn btn-block'; + $listClass = ($id == $listID and $mode == 'edit') ? 'btn btn-block active' : 'btn btn-block'; $shareIcon = in_array($id, $globalContacts) ? ' ' : ''; echo html::a(inlink('managecontacts', "listID=$id&mode=edit"), $shareIcon . $listName, '', "class='{$listClass}' title='$listName'"); } ?> - ' . $lang->user->contacts->createList, '', "class='btn btn-block'"); ?> +
-
-

+

- user->contacts->createList;?> + user->contacts->createList;?> - user->contacts->manage;?> + user->contacts->manage;?>

diff --git a/module/product/control.php b/module/product/control.php index 1bb3799757..d91cd8ba59 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -1048,7 +1048,7 @@ class product extends control public function ajaxGetPlans($productID, $branch = 0, $planID = 0, $fieldID = '', $needCreate = false, $expired = '', $param = '') { $param = strtolower($param); - $plans = $this->loadModel('productplan')->getPairs($productID, $branch == 0 ? '' : $branch, $expired, strpos($param, 'skipparent') !== false); + $plans = $this->loadModel('productplan')->getPairs($productID, $branch, $expired, strpos($param, 'skipparent') !== false); $field = $fieldID ? "plans[$fieldID]" : 'plan'; $multiple = strpos($param, 'multiple') === false ? '' : 'multiple'; $output = html::select($field, $plans, $planID, "class='form-control chosen' $multiple"); diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index f399b26b96..01b5627e58 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -9,7 +9,11 @@ * @link https://www.zentao.net */ ?> - +