Merge branch 'zentaopms_239_task#71576' into 'zentaopms_239'

* Finish task #71576,#71577,#71578,#71579.

See merge request easycorp/zentaopms!5684

module/task/view/batchedit.html.php

@@ -22,7 +22,7 @@ js::set('requiredFields', $config->task->edit->requiredFields);
   <div class='main-header'>
     <h2>
       <?php echo $lang->task->common . $lang->colon . $lang->task->batchEdit;?>
-      <?php if($executionName):?>
+      <?php if($executionName and $execution->multiple):?>
       <small class='text-muted'><?php echo $lang->task->execution . $lang->colon . ' ' . $executionName;?></small>
       <?php endif;?>
     </h2>

module/task/view/create.html.php

@@ -42,7 +42,7 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
     </div>
     <form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
       <table class='table table-form'>
-        <?php if($execution->type != 'kanban' or $this->config->vision == 'lite'):?>
+        <?php if(($execution->type != 'kanban' or $this->config->vision == 'lite') and $execution->multiple):?>
         <tr>
           <th><?php echo $lang->task->execution;?></th>
           <td><?php echo html::select('execution', $executions, $execution->id, "class='form-control chosen' onchange='loadAll(this.value)' required");?></td><td></td><td></td>

module/task/view/edit.html.php

@@ -107,7 +107,7 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->task->legendBasic;?></div>
             <table class='table table-form'>
-              <?php if($task->parent <= 0):?>
+              <?php if($task->parent <= 0 and $execution->multiple):?>
               <tr>
                 <th class='thWidth'><?php echo $lang->task->execution;?></th>
                 <td><?php echo html::select('execution', $executions, $task->execution, 'class="form-control chosen" onchange="loadAll(this.value)"');?></td>

module/task/view/view.html.php

@@ -182,25 +182,24 @@
           <div class='tab-pane active' id='legendBasic'>
             <table class="table table-data">
               <tbody>
+                <?php if($execution->multiple):?>
                 <tr>
-                  <?php
-                  $method = 'view';
-                  if($this->config->vision == 'lite') $method = 'kanban';
-                  ?>
                   <th class='w-90px'><?php echo $lang->task->execution;?></th>
                   <td>
-                  <?php
-                  if($execution->type != 'kanban')
-                  {
-                      common::printLink('execution', $method, "executionID={$task->execution}", $execution->name);
-                  }
-                  else
-                  {
-                      echo $execution->name;
-                  }
-                  ?>
-                </td>
+                    <?php
+                    $method = $this->config->vision == 'lite' ? 'kanban' : 'view';
+                    if($execution->type != 'kanban')
+                    {
+                        common::printLink('execution', $method, "executionID={$task->execution}", $execution->name);
+                    }
+                    else
+                    {
+                        echo $execution->name;
+                    }
+                    ?>
+                  </td>
                 </tr>
+                <?php endif;?>
                 <tr>
                   <th><?php echo $lang->task->module;?></th>
                   <?php