diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css index 8c3aff303c..936d99e76e 100644 --- a/module/execution/css/kanban.css +++ b/module/execution/css/kanban.css @@ -80,7 +80,7 @@ #kanbanScaleControl > .input-group-btn:first-child > .btn {border-radius: 16px 0 0 16px; border-right-color: transparent;} #kanbanScaleControl > .input-group-btn:last-child > .btn {border-radius: 0 16px 16px 0; border-left-color: transparent;} #kanbanScaleControl > .input-group-btn > .btn:hover {border-color: #b8bfce;} -#kanbanActionMenu {top: 24px; right: auto;} +#kanbanActionMenu {top: 24px; right: 57px;} .kanban + .kanban {margin-top: 15px} .kanban-card > .title {display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis} diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 2d9adc0fc9..ad07c19ee2 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -1668,19 +1668,18 @@ function searchCards(value) rdSearchValue = value; $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue), function(data) { - if(lastUpdateData === data) return; lastUpdateData = data; - var kanbanData = $.parseJSON(data); + kanbanData = $.parseJSON(data); var hideAll = true; $('#kanban').children('.region').children("div[id^='kanban']").each(function() { var regionID = $(this).attr('data-id'); if(kanbanData != null) data = groupBy == 'default' ? kanbanData[regionID] : kanbanData[groupBy]; - if(rdSearchValue != '' && data.laneCount != 0) $(this).parent().show(); - if(rdSearchValue != '' && data.laneCount == 0) $(this).parent().hide(); + if(rdSearchValue != '' && groupBy == 'default' && data.laneCount != 0) $(this).parent().show(); + if(rdSearchValue != '' && groupBy == 'default' && data.laneCount == 0) $(this).parent().hide(); - hideAll = hideAll && !updateRegion(regionID, data); + hideAll = !updateRegion(regionID, data) && hideAll; }); if(hideAll && rdSearchValue != '') diff --git a/module/kanban/model.php b/module/kanban/model.php index 341b91c526..1142e0de14 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1577,7 +1577,7 @@ class kanbanModel extends model $laneData['cards'][$column->columnType][] = $cardData; $cardOrder ++; } - if($searchValue != '' and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array(); + if($searchValue == '' and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array(); } if($searchValue != '' and empty($laneData['cards'])) continue;