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

* Fix bug#31517

Browse Source
This commit is contained in:
zenggang
2023-01-13 02:12:24 +00:00
parent aa2a622208
commit 37dc5793e0
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/view/ajaxgeteditorcontent.html.php
+13 -10
View File
@@ -47,7 +47,7 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
<div class="history"></div>
<div class="action-btn pull-right">
<div class="btn btn-close pull-right"><i class="icon icon-close"></i></div>
<?php if($canLinkStory or $canLinkBug or $canLinkTask or $canUnlinkObject):?>
<?php if($canLinkStory or $canLinkBug or $canLinkTask):?>
<div class="dropdown pull-right">
<button class="btn" type="button" data-toggle="context-dropdown"><i class="icon icon-ellipsis-v icon-rotate-90"></i></button>
<ul class="dropdown-menu">
@@ -55,7 +55,6 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
if($canLinkStory) echo '<li id="linkStory">' . html::a('javascript:;', '<i class="icon icon-lightbulb"></i> ' . $lang->repo->linkStory) . '</li>';
if($canLinkBug) echo '<li id="linkBug">' . html::a('javascript:;', '<i class="icon icon-bug"></i> ' . $lang->repo->linkBug) . '</li>';
if($canLinkTask) echo '<li id="linkTask">' . html::a('javascript:;', '<i class="icon icon-todo"></i> ' . $lang->repo->linkTask) . '</li>';
if($canUnlinkObject) echo '<li id="unlink">' . html::a('javascript:;', '<i class="icon icon-unlink"></i> ' . $lang->repo->unlink) . '</li>';
?>
</ul>
</div>
@@ -135,12 +134,10 @@ function getRelation(commit)
}
$('.table-empty-tip').hide();
$('#unlink').show();
$('#related button').show();
}
else
{
$('#unlink').hide();
if(!canLinkStory && !canLinkBug && !canLinkTask) $('#related button').hide();
}
@@ -157,6 +154,17 @@ function getRelation(commit)
$('#related').show();
}
<?php if($canUnlinkObject):?>
$('#relationTabs').on('onLoad', function(event, tab) {
var objectInfo = tab.id.split('-');
objectID = objectInfo[0];
objectType = objectInfo[1];
unlink = createLink('repo', 'unlink', 'repoID=' + repoID + '&commit=' + globalCommit + '&objectID=' + objectID + '&objectType=' + objectType);
$('#relationTabs ul li[data-id=' + tab.id + '] span.title').after('<a title="<?php echo $lang->repo->unlink;?>" class="unlinks" data-link="' + unlink + '"><i class="icon-unlink"></i></a>');
});
<?php endif;?>
/**
* Set tab data.
*
@@ -331,7 +339,7 @@ $(function()
parent.loadLinkPage(link);
});
$('#unlink a').on('click', function()
$('#relationTabs').on('click', '.unlinks',function()
{
var link = $(this).attr('data-link');
$.post(link, function(data)
@@ -352,11 +360,6 @@ $(function()
{
$('#tab-nav-item-' + tab.id).attr('title', tab.title);
var objectInfo = tab.id.split('-');
objectID = objectInfo[0];
objectType = objectInfo[1];
$('#unlink a').attr('data-link', createLink('repo', 'unlink', 'repoID=' + repoID + '&commit=' + globalCommit + '&objectID=' + objectID + '&objectType=' + objectType));
var relatedHeight = codeHeight / 5 * 2 - $('#log').height() - 45;
$('#relationTabs iframe').css('height', relatedHeight);
});