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

Merge branch 'sprint/231_liumengyi_26846' into 'master'

Browse Source 
* Fix bug #26846.

See merge request easycorp/zentaopms!5106
This commit is contained in:
孙广明
2022-08-25 02:03:22 +00:00
parent 41e346a299 723093c840
commit 5115d871b6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+2 -2
View File
@@ -2117,8 +2117,8 @@ EOD;
$select = '';
if($this->session->$typeOnlyCondition)
{
if(strpos($orderBy, 'priOrder_') !== false) $select .= ", IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder";
if(strpos($orderBy, 'severityOrder_') !== false) $select .= ", IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder";
if(strpos($orderBy, 'priOrder') !== false) $select .= ", IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder";
if(strpos($orderBy, 'severityOrder') !== false) $select .= ", IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder";
$sql = $this->dao->select("*$select")->from($table)
->where($queryCondition)
->beginIF($orderBy != false)->orderBy($orderBy)->fi()
module/story/view/batchclose.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<?php js::set('app', $app->tab);?>
<div class='main-content' id='mainContent'>
<div class='main-header'>
<h2><?php echo $lang->story->common . $lang->colon . $lang->story->batchClose;?></h2>
<h2><?php echo ($storyType == 'story' ? $lang->SRCommon : $lang->URCommon) . $lang->colon . $lang->story->batchClose;?></h2>
</div>
<?php if(isset($suhosinInfo)):?>
<div class='alert alert-info'><?php echo $suhosinInfo;?></div>