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 @@
id);?> |
task->priList, $task->pri, $task->pri)?> |
executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?>
- createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-width:80% data-toggle='modal'")?> |
+ createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-width='80%' data-toggle='modal'")?> |
estimate . $lang->execution->workHourUnit;?> |
deadline, 0, 4) > 0) echo $task->deadline;?> |
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;