Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/fixbug_liumengyi_23581' into 'master'

Browse Source 
* Fix bug #23581, and fix issue #673.

See merge request easycorp/zentaopms!3873
This commit is contained in:
王怡栋
2022-06-13 02:08:33 +00:00
parent 5c1f32c3d9 cb8dc6954c
commit c89ca73832
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -2
View File
@@ -3842,10 +3842,10 @@ class execution extends control
$enterTime = date('Y-m-d H:i:s', $enterTime);
$lastEditedTime = $this->dao->select("max(lastEditedTime) as lastEditedTime")->from(TABLE_KANBANLANE)->where('execution')->eq($executionID)->fetch('lastEditedTime');
if($from == 'execution') $this->session->set('taskSearchValue', $searchValue);
if($from == 'RD') $this->session->set('rdSearchValue', $searchValue);
if($lastEditedTime > $enterTime or $groupBy != 'default' or !empty($searchValue))
{
if($from == 'execution') $this->session->set('taskSearchValue', $searchValue);
if($from == 'RD') $this->session->set('rdSearchValue', $searchValue);
$kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy, $searchValue) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy, $searchValue);
return print(json_encode($kanbanGroup));
}
module/execution/js/kanban.js
+1
View File
@@ -1674,6 +1674,7 @@ function searchCards(value)
if(rdSearchValue != '' && groupBy == 'default' && data.laneCount != 0) $(this).parent().show();
if(rdSearchValue != '' && groupBy == 'default' && data.laneCount == 0) $(this).parent().hide();
$(this).empty();
hideAll = !updateRegion(regionID, data) && hideAll;
});
module/search/view/buildform.html.php
+1 -1
View File
@@ -526,7 +526,7 @@ $(function()
{
if(!$searchForm.find('#value' + i).hasClass('picker-select')) $searchForm.find('#value' + i).val('').trigger('chosen:updated');
if($searchForm.find('#value' + i).hasClass('picker-select')) $searchForm.find('#value' + i).data('zui.picker').setValue('');
$searchForm.find('#value' + i).val('').attr('placeholder','');
$searchForm.find('#value' + i + '.date').val('').attr('placeholder', '');
}
};