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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284

Browse Source
This commit is contained in:
tianshujie
2023-02-13 14:03:58 +08:00
parent 6f10625f57 780b9c26b7
commit ec0078c708
195 changed files with 6559 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
+2 -2
View File
@@ -809,9 +809,9 @@ if(!helper::hasFeature('kanban'))
if($config->edition == 'max' and !helper::hasFeature('scrum_auditplan'))
{
if(!helper::hasFeature('scrum_process'))
if(helper::hasFeature('scrum_process'))
{
$lang->admin->menu->model['dropMenu']->scrum = array('link' => "{$lang->scrumModel}|process|scrumbrowse|processID=0&browseType=scrum", 'subModule' => 'auditcl,process,activity,zoutput,classify,');
$lang->admin->menu->model['dropMenu']->scrum = array('link' => "{$lang->scrumModel}|process|scrumbrowse|browseType=scrum", 'subModule' => 'auditcl,process,activity,zoutput,classify,');
}
else
{
module/common/model.php
+9 -3
View File
@@ -514,6 +514,7 @@ class commonModel extends model
echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
echo html::avatar($app->user);
echo '</a>';
echo '<script>$("#userDropDownMenu").on("click", function(){$(this).removeClass("dropdown-hover");});$("#userDropDownMenu").on("hover", function(){$(this).next().removeClass("open");$(this).addClass("dropdown-hover");});</script>';
}
}
@@ -1016,7 +1017,8 @@ class commonModel extends model
{
foreach($lang->my->$moduleLinkList as $key => $linkList)
{
$method = explode('-', $key)[1];
$moduleMethodList = explode('-', $key);
$method = $moduleMethodList[1];
if(common::hasPriv($currentModule, $method))
{
$display = true;
@@ -2500,6 +2502,7 @@ EOD;
($module == 'file' and strpos('|read|download|uploadimages|ajaxwopifiles|', "|{$method}|") !== false) or
($module == 'report' && $method == 'annualdata') or
($module == 'misc' && $method == 'captcha') or
($module == 'bug' && $method == 'create') or
($module == 'execution' and $method == 'printkanban') or
($module == 'traincourse' and $method == 'ajaxuploadlargefile') or
($module == 'traincourse' and $method == 'playvideo'))
@@ -3179,11 +3182,13 @@ EOD;
* @param array $headers Set request headers.
* @param string $dataType
* @param string $method POST|PATCH|PUT
* @param int $timeout
* @param bool $httpCode
* @static
* @access public
* @return string
*/
public static function http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30)
public static function http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false)
{
global $lang, $app;
if(!extension_loaded('curl'))
@@ -3230,6 +3235,7 @@ EOD;
$response = curl_exec($curl);
$errors = curl_error($curl);
if($httpCode) $httpCode = curl_getinfo($curl,CURLINFO_HTTP_CODE);
curl_close($curl);
$logFile = $app->getLogRoot() . 'saas.'. date('Ymd') . '.log.php';
@@ -3248,7 +3254,7 @@ EOD;
if($errors) commonModel::$requestErrors[] = $errors;
return $response;
return $httpCode ? array($response, $httpCode) : $response;
}
/**
module/common/view/header.html.php
+1 -1
View File
@@ -21,7 +21,7 @@ include 'chosen.html.php';
<div id='userMenu'>
<ul id="userNav" class="nav nav-default">
<li class='dropdown dropdown-hover' id='globalCreate'><?php common::printCreateList();?></li>
<li class='dropdown dropdown-hover has-avatar'><?php common::printUserBar();?></li>
<li class='dropdown dropdown-hover has-avatar' id='userDropDownMenu'><?php common::printUserBar();?></li>
<li class='dropdown dropdown-hover' id='visionSwitcher'><?php common::printVisionSwitcher();?></li>
</ul>
</div>