* merge after 12.4.1 changes.

This commit is contained in:
z
2020-08-31 15:31:55 +08:00
parent ba32604be6
commit a9df6f3b9c
55 changed files with 364 additions and 146 deletions
+15 -5
View File
@@ -22,12 +22,22 @@
</div>
</div>
<?php
$visibleFields = array();
$visibleFields = array();
$requiredFields = array();
foreach(explode(',', $showFields) as $field)
{
if(strpos(",{$config->user->customBatchCreateFields},", ",{$field},") === false) continue;
if($field) $visibleFields[$field] = '';
}
foreach(explode(',', $config->user->create->requiredFields) as $field)
{
if($field)
{
$requiredFields[$field] = '';
if(strpos(",{$config->user->custom->batchCreateFields},", ",{$field},") !== false) $visibleFields[$field] = '';
}
}
$minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
?>
<form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
@@ -36,15 +46,15 @@
<thead>
<tr class='text-center'>
<th class='w-40px'><?php echo $lang->idAB;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'><?php echo $lang->user->dept;?></th>
<th class='w-150px<?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='w-130px required'><?php echo $lang->user->realname;?></th>
<th class='w-120px'><?php echo $lang->user->role;?></th>
<th class='w-120px<?php echo zget($requiredFields, 'role', '', ' required')?>'><?php echo $lang->user->role;?></th>
<th class='w-120px'><?php echo $lang->user->group;?></th>
<th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth)?>'><?php echo $lang->user->email;?></th>
<th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth) . zget($requiredFields, 'email', '', ' required')?>'><?php echo $lang->user->email;?></th>
<th class='genderThWidth<?php echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
<th class="<?php echo $minWidth;?> required"><?php echo $lang->user->password;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden') . zget($requiredFields, 'commiter', '', ' required')?>'> <?php echo $lang->user->commiter;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'> <?php echo $lang->user->join;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'> <?php echo $lang->user->skype;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'> <?php echo $lang->user->qq;?></th>