From f0cdfea18a0fc5f1c366c904ebcf4e7072af77ad Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 19 Aug 2022 02:39:40 +0000
Subject: [PATCH] *Fix bug

---
 module/block/view/taskblock.html.php | 2 +-
 module/execution/model.php           | 2 +-
 module/task/control.php              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index c33b36f579..e3d7621e72 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -45,7 +45,7 @@
         <td class='c-id-xs'><?php echo sprintf('%03d', $task->id);?></td>
         <td class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
         <?php $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?>
-        <td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-width:80% data-toggle='modal'")?></td>
+        <td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-width='80%' data-toggle='modal'")?></td>
         <?php if($longBlock):?>
         <td class='c-estimate text-center' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
         <td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
diff --git a/module/execution/model.php b/module/execution/model.php
index f41cb77cef..a2ac15c3ce 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1434,7 +1434,7 @@ class executionModel extends model
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
             ->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi()
             ->beginIF($status != 'all' and $status != 'undone' and $status != 'noclosed')->andWhere('status')->in($status)->fi()
-            ->beginIF(empty($this->config->CRExecution))->andWhere('status')->ne('closed')->fi()
+            ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF($devel === true)->andWhere('attribute')->in('dev,qa,release')->fi()
             ->orderBy($orderBy)
             ->beginIF($limit)->limit($limit)->fi()
diff --git a/module/task/control.php b/module/task/control.php
index ddf4f4a8a6..9a08c63e6c 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -45,7 +45,7 @@ class task extends control
         parse_str($extra, $output);
 
         if(!empty($executionID)) $execution = $this->execution->getById($executionID);
-        $executions  = $this->execution->getPairs(0, 'all', isset($execution) ? (!common::canModify('execution', $execution) ? 'noclosed' : '') : 'noclosed');
+        $executions  = $this->execution->getPairs(0, 'all', 'noclosed');
         $executionID = $this->execution->saveState($executionID, $executions);
         $execution   = $this->execution->getById($executionID);
         $this->execution->setMenu($executionID);
@@ -291,7 +291,7 @@ class task extends control
         /* Set Custom*/
         foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
 
-        $executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($projectID,empty($this->config->CRExecution) ? 'noclosed' : 'all', 0, true);
+        $executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($projectID,'noclosed', 0, true);
 
         $this->view->customFields  = $customFields;
         $this->view->showFields    = $this->config->task->custom->createFields;