* Fix bug #15460,17587.

This commit is contained in:
tianshujie
2022-04-02 10:13:13 +08:00
parent d993fe3734
commit a1eb251907
5 changed files with 31 additions and 10 deletions
+4 -3
View File
@@ -308,8 +308,6 @@ class design extends control
$repos = $this->loadModel('repo')->getRepoPairs('project', $design->project);
$repoID = $repoID ? $repoID : key($repos);
if(empty($repoID)) return print(js::locate(helper::createLink('repo', 'create', "objectID=$design->project")));
$repo = $this->loadModel('repo')->getRepoByID($repoID);
$revisions = $this->repo->getCommits($repo, '', 'HEAD', '', '', $begin, $end);
@@ -399,12 +397,15 @@ class design extends control
$this->app->loadClass('pager', $static = true);
$pager = pager::init(0, $recPerPage, $pageID);
$design = $this->design->getCommit($designID, $pager);
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->submission;
$this->view->position[] = $this->lang->design->submission;
$this->view->design = $this->design->getCommit($designID, $pager);
$this->view->design = $design;
$this->view->pager = $pager;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->repos = $this->loadModel('repo')->getRepoPairs('project', $design->project);
$this->display();
}
+2
View File
@@ -0,0 +1,2 @@
#mainContent .pull-right{margin-bottom: 10px}
.table{border: 1px solid #ddd;}
+20
View File
@@ -0,0 +1,20 @@
$(function()
{
$('#linkCommit').click(function()
{
if(repos.length == 0)
{
var onlybody = config.onlybody;
config.onlybody = 'no';
var link = createLink('repo', 'create', 'objectID=' + projectID);
config.onlybody = onlybody;
window.parent.$.apps.open(link, 'devops');
parent.$('#triggerModal').modal('hide');
return false;
}
});
});
+2 -2
View File
@@ -51,9 +51,9 @@
<td class='c-actions text-center'>
<?php
$vars = "design={$design->id}";
common::printIcon('design', 'edit', $vars, $design, 'list', 'alter', '', '', '', '', '', $design->project);
common::printIcon('design', 'edit', $vars, $design, 'list', 'alter');
common::printIcon('design', 'viewCommit', $vars, $design, 'list', 'list-alt', '', 'iframe showinonlybody', true);
common::printIcon('design', 'delete', $vars, $design, 'list', 'trash', 'hiddenwin', '', '', '', '', $design->project);
common::printIcon('design', 'delete', $vars, $design, 'list', 'trash', 'hiddenwin');
?>
</td>
</tr>
+3 -5
View File
@@ -11,10 +11,8 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<style>
#mainContent .pull-right{margin-bottom: 10px}
.table{border: 1px solid #ddd;}
</style>
<?php js::set('repos', $repos);?>
<?php js::set('projectID', $design->project);?>
<div id="mainContent">
<div class='main-header'>
<h2>
@@ -24,7 +22,7 @@
</h2>
</div>
<div class='btn-toolbar pull-right'>
<?php common::printLink('design', 'linkCommit', "designID=$design->id", "<i class='icon icon-plus'></i>" . $lang->design->linkCommit, '_blank', "class='btn btn-primary'");?>
<?php common::printLink('design', 'linkCommit', "designID=$design->id", "<i class='icon icon-plus'></i>" . $lang->design->linkCommit, '', "class='btn btn-primary' id='linkCommit'");?>
</div>
<?php if(empty($design->commit)):?>
<div class="table-empty-tip">