Merge branch 'zentaopms_239_task#71588' into 'zentaopms_239'

* Finish task #71588,#71589,#71590,#71591.

See merge request easycorp/zentaopms!5714

module/block/control.php

@@ -1760,8 +1760,8 @@ class block extends control
         if(common::hasPriv('todo',  'view'))                                                                                          $hasViewPriv['todo']        = true;
         if(common::hasPriv('task',  'view'))                                                                                          $hasViewPriv['task']        = true;
         if(common::hasPriv('bug',   'view') and $this->config->vision != 'lite')                                                      $hasViewPriv['bug']         = true;
-        if($this->config->URAndSR and common::hasPriv('story', 'view') and $this->config->vision != 'lite')                           $hasViewPriv['requirement'] = true;
         if(common::hasPriv('story', 'view') and $this->config->vision != 'lite')                                                      $hasViewPriv['story']       = true;
+        if($this->config->URAndSR and common::hasPriv('story', 'view') and $this->config->vision != 'lite')                           $hasViewPriv['requirement'] = true;
         if(common::hasPriv('risk',  'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasRisk)      $hasViewPriv['risk']        = true;
         if(common::hasPriv('issue', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasIssue)     $hasViewPriv['issue']       = true;
         if(common::hasPriv('meeting', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasMeeting) $hasViewPriv['meeting']     = true;

module/build/control.php

@@ -25,6 +25,8 @@ class build extends control
         {
             $project = $this->loadModel('project')->getByID($projectID);
             if(!$project->hasProduct) $hidden = 'hide';
+
+            $this->view->multipleProject = $project->multiple;
         }
 
         $this->view->hidden = $hidden;

module/build/view/create.html.php

@@ -20,10 +20,14 @@
     <form class='load-indicator main-form form-ajax' id='dataform' method='post' enctype='multipart/form-data'>
       <table class='table table-form'>
         <?php if($app->tab == 'project'):?>
+        <?php if(!empty($multipleProject)):?>
         <tr>
           <th><?php echo $lang->executionCommon;?></th>
           <td><?php echo html::select('execution', $executions, $executionID, "onchange='loadProducts(this.value);' class='form-control chosen' required");?></td>
         </tr>
+        <?php else:?>
+        <?php echo html::hidden('execution', $executionID);?>
+        <?php endif;?>
         <?php endif;?>
         <tr class="<?php echo $hidden;?>">
           <th><?php echo $lang->build->product;?></th>

module/build/view/edit.html.php

@@ -42,12 +42,14 @@
           </td>
           <td><?php if($disabled) echo $lang->build->notice->changeProduct;?></td>
         </tr>
+        <?php if(!empty($multipleProject)):?>
         <tr>
           <?php $disabled = $testtaskID ? 'disabled' : '';?>
           <th><?php echo $lang->build->execution;?></th>
           <td id='executionsBox'><?php echo html::select('execution', $executions, $build->execution, "class='form-control chosen' required $disabled");?></td>
           <td><?php if($disabled) echo $lang->build->notice->changeExecution;?></td>
         </tr>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->build->name;?></th>
           <td><?php echo html::input('name', $build->name, "class='form-control' required");?></td>

module/project/view/build.html.php

@@ -54,7 +54,9 @@
           <th class="c-name w-200px text-left"><?php echo $lang->build->product;?></th>
           <?php endif;?>
           <th class="c-name text-left"><?php echo $lang->build->name;?></th>
+          <?php if($project->multiple):?>
           <th class="c-name text-left"><?php echo $lang->executionCommon;?></th>
+          <?php endif;?>
           <th class="c-url"><?php echo $lang->build->scmPath;?></th>
           <th class="c-url"><?php echo $lang->build->filePath;?></th>
           <th class="c-date"><?php echo $lang->build->date;?></th>
@@ -74,7 +76,9 @@
             <?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
             <?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name, '', "data-app='project'");?>
           </td>
+          <?php if($project->multiple):?>
           <td class="c-name text-left" title='<?php echo $build->executionName;?>'><?php echo $build->executionName;?></td>
+          <?php endif;?>
           <td class="c-url" title="<?php echo $build->scmPath?>"><?php  echo strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath;?></td>
           <td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
           <td class="c-date"><?php echo $build->date?></td>