Merge branch release/22.0.beta of zentao/zentaopms (#13474)
This commit is contained in:
@@ -40,14 +40,15 @@ window.handleLinkObjectClick = function($this)
|
||||
* Set task summary for table footer.
|
||||
*
|
||||
* @param element element
|
||||
* @param array checkedidlist
|
||||
* @param array checkedIDList
|
||||
* @param string pageSummary
|
||||
* @access public
|
||||
* @return object
|
||||
*/
|
||||
window.setStoryStatistics = function(element, checkedIDList)
|
||||
window.setStoryStatistics = function(element, checkedIDList, pageSummary)
|
||||
{
|
||||
const checkedTotal = checkedIDList.length;
|
||||
if(checkedTotal == 0) return {html: summary};
|
||||
if(checkedTotal == 0) return {html: pageSummary};
|
||||
|
||||
let checkedEstimate = 0;
|
||||
let checkedCase = 0;
|
||||
|
||||
@@ -76,7 +76,6 @@ if(!empty($release->releases) || $release->deleted || ($app->tab == 'project' &&
|
||||
}
|
||||
|
||||
/* Table data and setting for finished stories tab. */
|
||||
jsVar('summary', $summary);
|
||||
jsVar('storyCases', $storyCases);
|
||||
jsVar('confirmunlinkstory', $lang->release->confirmUnlinkStory);
|
||||
jsVar('checkedSummary', $lang->product->checkedSRSummary);
|
||||
@@ -258,7 +257,7 @@ detailBody
|
||||
set::extraHeight('+144'),
|
||||
set::footToolbar($storyFootToolbar),
|
||||
set::footPager(usePager('storyPager', '', array('recPerPage' => $storyPager->recPerPage, 'recTotal' => $storyPager->recTotal, 'linkCreator' => createLink($releaseModule, 'view', "releaseID={$release->id}&type=story&link={$link}¶m={$param}&orderBy={$orderBy}&recTotal={$storyPager->recTotal}&recPerPage={recPerPage}&page={page}")))),
|
||||
set::checkInfo(jsRaw('function(checkedIDList){return window.setStoryStatistics(this, checkedIDList);}'))
|
||||
set::checkInfo(jsRaw("function(checkedIDList){return window.setStoryStatistics(this, checkedIDList, '{$summary}');}")),
|
||||
)
|
||||
),
|
||||
|
||||
@@ -316,7 +315,7 @@ detailBody
|
||||
set::orderBy($orderBy),
|
||||
set::extraHeight('+144'),
|
||||
set::footToolbar($leftBugFootToolbar),
|
||||
set::footPager(usePager('leftBugPager', '', array('recPerPage' => $leftBugPager->recPerPage, 'recTotal' => $leftBugPager->recTotal, 'linkCreator' => createLink($releaseModule, 'view', "releaseID={$release->id}&type=bug&link={$link}¶m={$param}&orderBy={$orderBy}&recTotal={$leftBugPager->recTotal}&recPerPage={recPerPage}&page={page}"))))
|
||||
set::footPager(usePager('leftBugPager', '', array('recPerPage' => $leftBugPager->recPerPage, 'recTotal' => $leftBugPager->recTotal, 'linkCreator' => createLink($releaseModule, 'view', "releaseID={$release->id}&type=leftBug&link={$link}¶m={$param}&orderBy={$orderBy}&recTotal={$leftBugPager->recTotal}&recPerPage={recPerPage}&page={page}"))))
|
||||
)
|
||||
),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user