From 450f2d7d89a8f1b7528e2f653175c842adfb674f Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Mon, 21 Mar 2022 17:06:12 +0800
Subject: [PATCH] * remove user vision field if there is no other vision
 available, task #51318, bug #20691.

---
 module/user/view/batchcreate.html.php | 15 ++++++++++-----
 module/user/view/batchedit.html.php   |  9 +++++++--
 module/user/view/create.html.php      |  4 ++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index abe8fe1eac..b35e2ef1f1 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -39,6 +39,7 @@
       }
   }
   $minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
+  $showVisionList = count($visionList) > 1;
   ?>
   <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
     <div class="table-responsive">
@@ -49,7 +50,9 @@
             <th class='c-dept<?php echo zget($visibleFields, 'dept', ' hidden') . zget($requiredFields, 'dept', '', ' required');?>'>              <?php echo $lang->user->dept;?></th>
             <th class='accountThWidth required'><?php echo $lang->user->account;?></th>
             <th class='c-realname required'><?php echo $lang->user->realname;?></th>
-            <th class='c-visions required'><?php echo $lang->user->visions;?></th>
+            <?php if($showVisionList):?>
+              <th class='c-visions required'><?php echo $lang->user->visions;?></th>
+            <?php endif;?>
             <th class='c-role<?php echo zget($requiredFields, 'role', '', ' required')?>'><?php echo $lang->user->role;?></th>
             <th class='c-group'><?php echo $lang->user->group;?></th>
             <th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth) . zget($requiredFields, 'email', '', ' required')?>'><?php echo $lang->user->email;?></th>
@@ -80,10 +83,12 @@
           <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 1 ? 'ditto' : $deptID, "class='form-control chosen'");?></td>
           <td><?php echo html::input("account[$i]", '', "class='form-control account_$i' onchange='changeEmail($i)'");?></td>
           <td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
-          <td class="<?php echo $config->systemMode == 'new' ? 'text-left' : 'text-center';?>" style='overflow:visible'>
-            <?php if($config->systemMode == 'new')     echo html::select("visions[$i][]", $visionList, $i > 1 ? 'ditto' : (isset($visionList[$this->config->vision]) ? $this->config->vision : key($visionList)), "class='form-control chosen' multiple");?>
-            <?php if($config->systemMode == 'classic') echo $visionList['rnd'] . html::hidden("visions[$i][]", 'rnd');?>
-          </td>
+          <?php if($showVisionList):?>
+            <td class="<?php echo $config->systemMode == 'new' ? 'text-left' : 'text-center';?>" style='overflow:visible'>
+              <?php if($config->systemMode == 'new')     echo html::select("visions[$i][]", $visionList, $i > 1 ? 'ditto' : (isset($visionList[$this->config->vision]) ? $this->config->vision : key($visionList)), "class='form-control chosen' multiple");?>
+              <?php if($config->systemMode == 'classic') echo $visionList['rnd'] . html::hidden("visions[$i][]", 'rnd');?>
+            </td>
+          <?php endif;?>
           <td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 1 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
           <td class='text-left' style='overflow:visible'><?php echo html::select("group[$i][]", $groupList, $i > 1 ? 'ditto' : '', "class='form-control chosen' multiple");?></td>
           <td <?php echo zget($visibleFields, 'email', "class='hidden'")?>><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)'");?></td>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index f3b2632488..9fb09fb21a 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -38,6 +38,7 @@
       }
   }
   $minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
+  $showVisionList = count($visionList) > 1;
   ?>
   <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
     <div class="table-responsive">
@@ -48,7 +49,9 @@
             <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'>         <?php echo $lang->user->dept;?></th>
             <th class='<?php echo $minWidth?> required'><?php echo $lang->user->account;?></th>
             <th class='<?php echo $minWidth?> required'><?php echo $lang->user->realname;?></th>
-            <th class='w-130px required'><?php echo $lang->user->visions;?></th>
+            <?php if($showVisionList):?>
+              <th class='w-130px required'><?php echo $lang->user->visions;?></th>
+            <?php endif;?>
             <th class='w-120px'><?php echo $lang->user->role;?></th>
             <th class='w-120px'><?php echo $lang->user->type;?></th>
             <th class='<?php echo $minWidth . zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
@@ -82,7 +85,9 @@
           <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$user->id]", $depts, $dept, "class='form-control chosen'");?></td>
           <td><?php echo html::input("account[$user->id]",  $user->account, "class='form-control'");?></td>
           <td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control'");?></td>
-          <td class="<?php echo $config->systemMode == 'new' ? 'text-left' : 'text-center';?>"><?php echo $config->systemMode == 'new' ? html::select("visions[$user->id][]", $visionList, $user->visions, "class='form-control chosen' multiple") : $visionList['rnd'];?></td>
+          <?php if($showVisionList):?>
+            <td class="<?php echo $config->systemMode == 'new' ? 'text-left' : 'text-center';?>"><?php echo $config->systemMode == 'new' ? html::select("visions[$user->id][]", $visionList, $user->visions, "class='form-control chosen' multiple") : $visionList['rnd'];?></td>
+          <?php endif;?>
           <?php if($config->systemMode == 'classic') echo html::hidden("visions[$user->id][]", 'rnd');?>
           <td><?php echo html::select("role[$user->id]",    $lang->user->roleList, $role, "class='form-control'");?></td>
           <td><?php echo html::select("type[$user->id]",    $lang->user->typeList, $type, "class='form-control'");?></td>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 0c47c54a04..3a93dd83e4 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -60,9 +60,9 @@
           <th><?php echo $lang->user->password2;?></th>
           <td><?php echo html::password('password2', '', "class='form-control'");?></td>
         </tr>
-        <tr>
+        <?php $visionList = $this->user->getVisionList();?>
+        <tr <?php if(count($visionList) < 2) echo "class='hide'";?>>
           <th><?php echo $lang->user->visions;?></th>
-          <?php $visionList = $this->user->getVisionList();?>
           <td><?php echo html::checkbox('visions', $visionList, isset($visionList[$this->config->vision]) ? $this->config->vision : key($visionList), "class='form-control'");?></td>
         </tr>
         <tr>