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

Merge branch 'sprint/182_tianshujie_18692' into 'master'

Browse Source 
* Fix bug #18692.

See merge request easycorp/zentaopms!1491
This commit is contained in:
孙广明
2022-01-19 01:02:24 +00:00
parent f3a6122cbe bb1d4c3839
commit 0c17431df8
1 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/kanban.js
+40 -18
View File
@@ -821,6 +821,8 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
showIframe = true;
}
}
if(fromLaneID != toLaneID && fromColID == toColID) shiftCard(objectID, fromColID, toColID, fromLaneID, toLaneID, regionID);
}
/* Bug lane. */
@@ -868,24 +870,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
}
}
if(moveCard || (fromLaneID != toLaneID && fromColID == toColID))
{
var link = createLink('kanban', 'ajaxMoveCard', 'cardID=' + objectID + '&fromColID=' + fromColID + '&toColID=' + toColID + '&fromLaneID=' + fromLaneID + '&toLaneID=' + toLaneID + '&execitionID=' + executionID + '&browseType=' + browseType + '&groupBy=' + groupBy + '&regionID=' + regionID + '&orderBy=' + orderBy );
$.ajax(
{
method: 'post',
dataType: 'json',
url: link,
success: function(data)
{
updateRegion(regionID, data[regionID]);
},
error: function(xhr, status, error)
{
showErrorMessager(error || lang.timeout);
}
});
}
if(moveCard || (fromLaneID != toLaneID && fromColID == toColID)) shiftCard(objectID, fromColID, toColID, fromLaneID, toLaneID, regionID);
}
/* Story lane. */
@@ -918,6 +903,43 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
}
}
/**
* Shift card.
*
* @param int objectID
* @param int fromColID
* @param int toColID
* @param int fromLaneID
* @param int toLaneID
* @param int regionID
* @access public
* @return void
*/
function shiftCard(objectID, fromColID, toColID, fromLaneID, toLaneID, regionID)
{
var link = createLink('kanban', 'ajaxMoveCard', 'cardID=' + objectID + '&fromColID=' + fromColID + '&toColID=' + toColID + '&fromLaneID=' + fromLaneID + '&toLaneID=' + toLaneID + '&execitionID=' + executionID + '&browseType=' + browseType + '&groupBy=' + groupBy + '&regionID=' + regionID + '&orderBy=' + orderBy );
$.ajax(
{
method: 'post',
dataType: 'json',
url: link,
success: function(data)
{
updateRegion(regionID, data[regionID]);
},
error: function(xhr, status, error)
{
showErrorMessager(error || lang.timeout);
}
});
}
/**
* Process minus button.
*
* @access public
* @return void
*/
function processMinusBtn()
{
var columnCount = $('#splitTable .child-column').size();