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

Merge branch 'zenops_61' into 'master'

Browse Source 
* Fix bug #32108.

See merge request easycorp/zentaopms!6944
This commit is contained in:
孙广明
2023-02-14 05:25:36 +00:00
parent 20f17196b2 9c920b1547
commit 2ce8e96e31
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zahost/js/browse.js
+2 -2
View File
@@ -7,13 +7,13 @@ $('#hostList tr[data-status="wait"]').hover(function(){
if(showFeature)
{
var encodedHelpPageUrl = encodeURIComponent('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao');
var urlForNewTab = window.location.origin + '#app=help&url=' + encodedHelpPageUrl;
var urlForNewTab = webRoot + '#app=help&url=' + encodedHelpPageUrl;
window.open(urlForNewTab)
}
$('#helpTab').click(function()
{
var encodedHelpPageUrl = encodeURIComponent('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao');
var urlForNewTab = window.location.origin + '#app=help&url=' + encodedHelpPageUrl;
var urlForNewTab = webRoot + '#app=help&url=' + encodedHelpPageUrl;
window.open(urlForNewTab)
})
module/zahost/view/browse.html.php
+1
View File
@@ -14,6 +14,7 @@
<?php js::set('confirmDelete', $lang->zahost->confirmDelete)?>
<?php js::set('browseType', $browseType);?>
<?php js::set('showFeature', $showFeature);?>
<?php js::set('webRoot', getWebRoot());?>
<div id='mainMenu' class='clearfix'>
<div class='pull-left btn-toolbar'>
<a href='#' class='btn btn-link querybox-toggle' id='bysearchTab'><i class='icon-search icon'></i> <?php echo $lang->zahost->byQuery;?></a>
module/zanode/js/browse.js
+2 -2
View File
@@ -1,13 +1,13 @@
if(showFeature)
{
var encodedHelpPageUrl = encodeURIComponent('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao');
var urlForNewTab = window.location.origin + '#app=help&url=' + encodedHelpPageUrl;
var urlForNewTab = webRoot + '#app=help&url=' + encodedHelpPageUrl;
window.open(urlForNewTab)
}
$('#helpTab').click(function()
{
var encodedHelpPageUrl = encodeURIComponent('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao');
var urlForNewTab = window.location.origin + '#app=help&url=' + encodedHelpPageUrl;
var urlForNewTab = webRoot + '#app=help&url=' + encodedHelpPageUrl;
window.open(urlForNewTab)
})
module/zanode/js/view.js
+1 -1
View File
@@ -180,7 +180,7 @@ $('.btn-pwd-show').live('click', function()
$('#jumpManual').click(function()
{
var encodedHelpPageUrl = encodeURIComponent('https://www.zentao.net/book/zentaopms/974.html?fullScreen=zentao');
var urlForNewTab = window.location.origin + '#app=help&url=' + encodedHelpPageUrl;
var urlForNewTab = webRoot + '#app=help&url=' + encodedHelpPageUrl;
window.open(urlForNewTab)
})
module/zanode/view/browse.html.php
+1
View File
@@ -18,6 +18,7 @@
<?php js::set('confirmShutdown', $lang->zanode->confirmShutdown) ?>
<?php js::set('actionSuccess', $lang->zanode->actionSuccess) ?>
<?php js::set('showFeature', $showFeature);?>
<?php js::set('webRoot', getWebRoot());?>
<div id='mainMenu' class='clearfix'>
<div class='pull-left btn-toolbar'>
<?php echo html::a($this->createLink('zanode', 'browse'), "<span class='text'>{$lang->zanode->all}</span>", '', "class='btn btn-link btn-active-text'"); ?>
module/zanode/view/view.html.php
+1
View File
@@ -21,6 +21,7 @@
<?php js::set('nodeID', $zanode->id) ?>
<?php js::set('zanodeLang', $lang->zanode); ?>
<?php js::set('nodeStatus', $zanode->status); ?>
<?php js::set('webRoot', getWebRoot());?>
<?php $browseLink = $this->session->zanodeList ? $this->session->zanodeList : $this->createLink('zanode', 'browse', ""); ?>
<?php
$vars = "id={$zanode->id}&orderBy=%s";