Merge branch 'sprint/tsj_fixbug' into 'master'
* Fix bug #31470. See merge request easycorp/zentaopms!6692
This commit is contained in:
@@ -52,7 +52,7 @@
|
||||
<?php if(isset($execution->delay)):?>
|
||||
<span class="status-project status-delayed" title='<?php echo $lang->execution->delayed;?>'><?php echo $lang->execution->delayed;?></span>
|
||||
<?php else:?>
|
||||
<?php $statusName = $this->processStatus('project', $execution);?>
|
||||
<?php $statusName = $this->processStatus('execution', $execution);?>
|
||||
<span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
|
||||
<?php endif;?>
|
||||
</td>
|
||||
|
||||
@@ -167,6 +167,7 @@ class tutorialModel extends model
|
||||
$project->fluidBoard = 0;
|
||||
$project->deleted = '0';
|
||||
$project->hasProduct = '';
|
||||
$project->multiple = '';
|
||||
|
||||
return $project;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user