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

Merge branch 'sprint/master_tanghucheng_bug' into 'master'

Browse Source 
* Fix bug #50369.

See merge request easycorp/zentaopms!2133
This commit is contained in:
王怡栋
2022-03-08 02:26:35 +00:00
parent f898e8c305 b279fbbc3e
commit ed5aa3d335
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/story/ext/view/review.lite.html.hook.php
+2 -2
View File
@@ -1,4 +1,4 @@
<script>
$("a[href^='#affectedBugs']").parent().remove();
$("a[href^='#affectedCases']").parent().remove();
$("#mainContent").find("#verify").closest("tr").addClass("hide");
$("#mainContent").find("#affectedProjects").closest("tr").addClass("hide");
</script>
framework/base/control.class.php
+7 -7
View File
@@ -781,12 +781,9 @@ class baseControl
*/
$file2Included = $moduleControlFile;
$commonActionExtFile = $actionExtPath['custom'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
if(!empty($actionExtPath['vision']))
if(!empty($actionExtPath['common']))
{
$commonActionExtFile = $actionExtPath['vision'] . strtolower($methodName) . '.php';
$commonActionExtFile = $actionExtPath['common'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
}
@@ -796,12 +793,15 @@ class baseControl
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
}
if(!empty($actionExtPath['common']))
if(!empty($actionExtPath['vision']))
{
$commonActionExtFile = $actionExtPath['common'] . strtolower($methodName) . '.php';
$commonActionExtFile = $actionExtPath['vision'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
}
$commonActionExtFile = $actionExtPath['custom'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
if(!empty($actionExtPath['site']))
{
/**
module/dept/model.php
+1 -2
View File
@@ -383,8 +383,7 @@ class deptModel extends model
->beginIF($browseType == 'inside')->andWhere('type')->eq('inside')->fi()
->beginIF($browseType == 'outside')->andWhere('type')->eq('outside')->fi()
->beginIF($deptID)->andWhere('dept')->in($deptID)->fi()
->beginIF($this->config->vision == 'lite')->andWhere('visions')->eq('lite')->fi()
->beginIF($this->config->vision != 'lite')->andWhere('visions')->ne('lite')->fi()
->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll();