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

* Fix bug #37285.

Browse Source
This commit is contained in:
zhaoke
2023-09-01 11:53:15 +08:00
parent da12c7317c
commit 7b56164e8a
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/control.php
+2 -2
View File
@@ -1130,7 +1130,7 @@ class repo extends control
$linkedStories = $this->repo->getRelationByCommit($repoID, $revision, 'story');
if($browseType == 'bySearch')
{
$allStories = $this->story->getBySearch($product->id, 0, $queryID, 'id', '', 'story', array_keys($linkedStories), $pager);
$allStories = $this->story->getBySearch($product->id, 0, $queryID, $orderBy, '', 'story', array_keys($linkedStories), $pager);
}
else
{
@@ -1217,7 +1217,7 @@ class repo extends control
$linkedBugs = $this->repo->getRelationByCommit($repoID, $revision, 'bug');
if($browseType == 'bySearch')
{
$allBugs = $this->bug->getBySearch($product->id, 0, $queryID, 'id_desc', array_keys($linkedBugs), $pager);
$allBugs = $this->bug->getBySearch($product->id, 0, $queryID, $orderBy, array_keys($linkedBugs), $pager);
}
else
{
module/repo/js/linkbug.ui.js
+1 -1
View File
@@ -3,7 +3,7 @@ window.createSortLink = function(col)
var sort = col.name + '_asc';
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{orderBy}', sort);
return "javascript:loadModal('" + sortLink.replace('{orderBy}', sort) + "', '#table-repo-linkbug')";
}
$(document).off('click','.dtable-footer .batch-btn').on('click', '.dtable-footer .batch-btn', function(e)
module/repo/js/linkstory.ui.js
+9 -2
View File
@@ -3,7 +3,7 @@ window.createSortLink = function(col)
var sort = col.name + '_asc';
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{orderBy}', sort);
return "javascript:loadModal('" + sortLink.replace('{orderBy}', sort) + "', '#table-repo-linkstory')";
}
$(document).off('click','.dtable-footer .batch-btn').on('click', '.dtable-footer .batch-btn', function(e)
@@ -20,4 +20,11 @@ $(document).off('click','.dtable-footer .batch-btn').on('click', '.dtable-footer
url: $(this).data('url'),
data: postData
});
});
});
$('#table-repo-linkstory').on('click', 'a', function(e)
{
console.log(1111, e);
e.preventDefault();
return;
})
module/repo/js/linktask.ui.js
+1 -1
View File
@@ -3,7 +3,7 @@ window.createSortLink = function(col)
var sort = col.name + '_asc';
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{orderBy}', sort);
return "javascript:loadModal('" + sortLink.replace('{orderBy}', sort) + "', '#table-repo-linktask')";
}
$(document).off('click','.dtable-footer .batch-btn').on('click', '.dtable-footer .batch-btn', function(e)