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

Merge branch 'cyy_fixbug' into 'master'

Browse Source 
Cyy fixbug

See merge request easycorp/zentaopms!7410
This commit is contained in:
王怡栋
2023-04-14 06:30:31 +00:00
parent f7a5d31793 896f117c66
commit 600b9c4949
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/view.css
+6
View File
@@ -25,6 +25,12 @@
.article-content .info .keywords .label {padding-right:8px; padding-left:8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height:22px; line-height:14px; margin-right:4px;}
.article-content {width: 100%; display: inline-block;}
.article-content.comment .comment-content {width: 94%;}
#outlineMenu {max-width: 200px;}
#outlineMenu .tree li > a {text-overflow: clip;}
.outline-toggle {position: absolute; right: 20px; top: 50px;}
.outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
.outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
.outline-toggle {position: absolute; right: 55px; top: 50px;}
.outline ul li {list-style: none;}
.outline-content {display: none; padding-top: 18px;}
module/doc/js/view.js
+6
View File
@@ -8,6 +8,12 @@ $(function()
})
$('.menu-actions > a').blur(function() {$(this).css('background', 'none');})
$('.comment-edit-form').ajaxForm({
success: function(data) {
location.reload();
}
})
})
/**
module/doc/view/content.html.php
-1
View File
@@ -28,7 +28,6 @@
</div>
</div>
<div class="actions">
<span class='text'><?php echo$lang->doc->diff?></span>
<?php echo html::a("javascript:fullScreen()", '<span class="icon-fullscreen"></span>', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");?>
<?php if(common::hasPriv('doc', 'collect')):?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
module/gitlab/model.php
+5 -4
View File
@@ -1020,16 +1020,17 @@ class gitlabModel extends model
/**
* Get single project by API.
*
* @param int $gitlabID
* @param int $projectID
* @param int $gitlabID
* @param int $projectID
* @param bool $useUser
* @access public
* @return object
*/
public function apiGetSingleProject($gitlabID, $projectID)
public function apiGetSingleProject($gitlabID, $projectID, $useUser = false)
{
if(isset($this->projects[$gitlabID][$projectID])) return $this->projects[$gitlabID][$projectID];
$url = sprintf($this->getApiRoot($gitlabID, false), "/projects/$projectID");
$url = sprintf($this->getApiRoot($gitlabID, $useUser), "/projects/$projectID");
$this->projects[$gitlabID][$projectID] = json_decode(commonModel::http($url, $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false));
return $this->projects[$gitlabID][$projectID];
}
module/mr/control.php
+1 -1
View File
@@ -960,7 +960,7 @@ class mr extends control
$projects = $scm == 'gitlab' ? $this->$scm->apiGetForks($hostID, $projectID) : array();
/* Second step: get project itself. */
$projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID);
$projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID, true);
/* Last step: find its upstream recursively. */
$project = $this->$scm->apiGetUpstream($hostID, $projectID);