Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #2581.

Browse Source
This commit is contained in:
tianshujie98
2020-08-11 09:30:12 +08:00
parent 5b75245191
commit fba9a11c58
3 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/model.php
+20
View File
@@ -323,6 +323,16 @@ class userModel extends model
$data[$i]->address = $users->address[$i];
$data[$i]->zipcode = $users->zipcode[$i];
/* Check required fields. */
foreach(explode(',', $this->config->user->create->requiredFields) as $field)
{
$field = trim($field);
if(empty($field)) continue;
if(!empty($data[$i]->$field)) continue;
die(js::error(sprintf($this->lang->error->notempty, $this->lang->user->$field)));
}
/* Change for append field, such as feedback.*/
if(!empty($this->config->user->batchAppendFields))
{
@@ -520,6 +530,16 @@ class userModel extends model
$users[$id]['dept'] = $data->dept[$id] == 'ditto' ? (isset($prev['dept']) ? $prev['dept'] : 0) : $data->dept[$id];
$users[$id]['role'] = $data->role[$id] == 'ditto' ? (isset($prev['role']) ? $prev['role'] : 0) : $data->role[$id];
/* Check required fields. */
foreach(explode(',', $this->config->user->edit->requiredFields) as $field)
{
$field = trim($field);
if(empty($field)) continue;
if(!empty($users[$id][$field])) continue;
die(js::error(sprintf($this->lang->error->notempty, $this->lang->user->$field)));
}
if(!empty($this->config->user->batchAppendFields))
{
$appendFields = explode(',', $this->config->user->batchAppendFields);
module/user/view/batchcreate.html.php
+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>
module/user/view/batchedit.html.php
+19 -9
View File
@@ -21,12 +21,22 @@
</div>
</div>
<?php
$visibleFields = array();
$visibleFields = array();
$requiredFields = array();
foreach(explode(',', $showFields) as $field)
{
if(strpos(",{$config->user->customBatchEditFields},", ",{$field},") === false) continue;
if($field)$visibleFields[$field] = '';
}
foreach(explode(',', $config->user->edit->requiredFields) as $field)
{
if($field)
{
$requiredFields[$field] = '';
if(strpos(",{$config->user->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = '';
}
}
$minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
?>
<form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
@@ -42,14 +52,14 @@
<th class='<?php echo $minWidth . zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
<th class='<?php echo $minWidth . zget($visibleFields, 'email', ' hidden')?>'> <?php echo $lang->user->email;?></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>
<th class='w-120px<?php echo zget($visibleFields, 'dingding', ' hidden')?>'> <?php echo $lang->user->dingding;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'weixin', ' hidden')?>'> <?php echo $lang->user->weixin;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'> <?php echo $lang->user->mobile;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'slack', ' hidden')?>'> <?php echo $lang->user->slack;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'whatsapp', ' hidden')?>'> <?php echo $lang->user->whatsapp;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'> <?php echo $lang->user->phone;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden') . zget($requiredFields, 'skype', '', ' required')?>'> <?php echo $lang->user->skype;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden') . zget($requiredFields, 'qq', '', ' required')?>'> <?php echo $lang->user->qq;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'dingding', ' hidden') . zget($requiredFields, 'dingding', '', ' required')?>'><?php echo $lang->user->dingding;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'weixin', ' hidden') . zget($requiredFields, 'weixin', '', ' required')?>'> <?php echo $lang->user->weixin;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden') . zget($requiredFields, 'mobile', '', ' required')?>'> <?php echo $lang->user->mobile;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'slack', ' hidden') . zget($requiredFields, 'slack', '', ' required')?>'> <?php echo $lang->user->slack;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'whatsapp', ' hidden') . zget($requiredFields, 'whatsapp', '', ' required')?>'><?php echo $lang->user->whatsapp;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden') . zget($requiredFields, 'phone', '', ' required')?>'> <?php echo $lang->user->phone;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'> <?php echo $lang->user->zipcode;?></th>
</tr>