Merge branch 'fix_bug#25891' into 'master'

* Fix bug 25891.

See merge request easycorp/zentaopms!4915

module/execution/view/edit.html.php

@@ -23,7 +23,7 @@
         <small><?php echo $lang->arrow . ' ' . $lang->execution->edit;?></small>
       </h2>
     </div>
-    <?php echo html::hidden('project', 0);?>
+    <?php echo html::hidden('project', $project->id);?>
     <form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
         <?php if($config->systemMode == 'new' and isset($project)):?>

module/task/model.php

@@ -3807,7 +3807,7 @@ class taskModel extends model
         $list .= common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "id=$task->id"), $task->name, '', "style='color: $task->color'", "data-app='project'") : "<span style='color:$task->color'>$task->name</span>";
         if(!helper::isZeroDate($task->deadline))
         {
-            if($task->status != done)
+            if($task->status != 'done')
             {
                 $list .= strtotime($today) > strtotime($task->deadline) ? '<span class="label label-danger label-badge">' . $this->lang->execution->delayed . '</span>' : '';
             }