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

Merge branch 'cyy_repo' into 'zenops_41'

Browse Source 
* Modify common style.

See merge request easycorp/zentaopms!4856
This commit is contained in:
李玉春
2022-08-09 06:28:23 +00:00
parent b3b2e4560c af0c0d4eae
commit 835f066ea5
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/job/control.php
+13 -1
View File
@@ -49,12 +49,24 @@ class job extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
$this->app->loadLang('compile');
$this->view->jobList = $this->job->getList($repoID, $orderBy, $pager);
$jobList = $this->job->getList($repoID, $orderBy, $pager);
$this->loadModel('gitlab');
foreach($jobList as $job)
{
$job->canExec = true;
if($job->engine == 'gitlab')
{
$pipeline = json_decode($job->pipeline);
$branch = $this->gitlab->apiGetSingleBranch($job->server, $pipeline->project, $pipeline->reference);
if($branch and isset($branch->can_push) and !$branch->can_push) $job->canExec = false;
}
}
$this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->browse;
$this->view->position[] = $this->lang->ci->job;
$this->view->position[] = $this->lang->job->browse;
$this->view->repoID = $repoID;
$this->view->jobList = $jobList;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
module/job/view/browse.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
<?php
common::printIcon('compile', 'browse', "repoID={$job->repo}&jobID=$id", '', 'list', 'history');
common::printIcon('job', 'edit', "jobID=$id", '', 'list', 'edit');
common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play');
common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play', '', $job->canExec ? '' : 'disabled');
if(common::hasPriv('job', 'delete')) echo html::a($this->createLink('job', 'delete', "jobID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->job->delete}' class='btn'");
?>
</td>
module/repo/css/common.css
+6 -3
View File
@@ -111,12 +111,12 @@ h3 {font-size: 16px;}
.repoCode .comment-cell .bug-edit-form, {padding: 10px; display: none;}
.repoCode .comment-cell .editing .bug-edit-form, .repoCode .comment-cell .commentContainer.show-form .comment-edit-form {display: block;}
.repoCode .comment {border: 1px solid #e5e5e5; background: #fafafa; padding: 5px 10px; margin-bottom: 10px;}
.repoCode .comment {border: 1px solid #e5e5e5; background: #fafafa; padding: 5px 10px 1px; margin-bottom: 10px;}
.repoCode .comment .comment-edit-form {margin-top: 10px;}
.repoCode .panel-bug .steps {background: #f1f1f1; padding: 5px 10px;}
.repoCode .panel-bug .bug-edit-form {margin-bottom: 10px;}
.repoCode .panel-bug .panel-body {display: none;}
.repoCode .panel-bug .panel-heading {cursor: pointer;}
.repoCode .panel-bug .panel-heading {cursor: pointer; border-bottom: 1px solid #edf3ff;}
.repoCode .panel-bug.show .panel-body {display: block;}
.repoCode .panel-bug.show .icon-chevron-sign-down:before {content: '\e711';}
.repoCode .panel-bug.show-edit-form .bug-edit-form,
@@ -128,7 +128,7 @@ h3 {font-size: 16px;}
.repoCode .comment .comment-edit-form,
.repoCode .panel-bug.show-edit-form .panel-body .title,
.repoCode .panel-bug.show-edit-form .bug-date,
.repoCode .comment.show-form .comment-content, .repoCode .comment.show-form .comment-date {display: none;}
.repoCode .comment.show-form .comment-content {display: none;}
.repoCode .text-content {white-space: normal; white-space: pre-line;}
.repoCode .text-muted {color: #aaa;}
@@ -193,3 +193,6 @@ h3 {font-size: 16px;}
.tips-git a {padding-bottom: 1px;}
.bug-lines {font-size: revert;}
.comment.show-form .comment-form-div {margin-top: 20px; padding-bottom: 10px;}
.comment .avatar {margin-right: 10px;}