Merge branch release/21.7.7 of zentao/zentaopms (#12268)
This commit is contained in:
@@ -10,7 +10,7 @@ $config->user->availableBatchCreateFields = 'dept,email,gender,commiter,join,sky
|
||||
$config->user->availableBatchEditFields = 'dept,email,commiter,skype,qq,dingding,weixin,mobile,slack,whatsapp,phone,address,zipcode';
|
||||
|
||||
$config->user->list = new stdclass();
|
||||
$config->user->list->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,dingding,weixin,mobile,slack,whatsapp,phone,address,zipcode';
|
||||
$config->user->list->customBatchCreateFields = 'email,gender,commiter,skype,qq,dingding,weixin,mobile,slack,whatsapp,phone,address,zipcode';
|
||||
$config->user->list->customBatchEditFields = 'dept,email,commiter,skype,qq,dingding,weixin,mobile,slack,whatsapp,phone,address,zipcode';
|
||||
|
||||
$config->user->custom = new stdclass();
|
||||
|
||||
@@ -65,7 +65,7 @@ formBatchPanel
|
||||
set::items($depts),
|
||||
set::value($deptID ? $deptID : ''),
|
||||
set::ditto(true),
|
||||
set::hidden(!in_array('dept', $showFields) || $type != 'inside')
|
||||
set::hidden($type != 'inside')
|
||||
),
|
||||
formBatchItem
|
||||
(
|
||||
@@ -197,7 +197,7 @@ formBatchPanel
|
||||
set::label($lang->user->join),
|
||||
set::control('date'),
|
||||
set::width('120px'),
|
||||
set::hidden(!in_array('join', $showFields) || $type != 'inside')
|
||||
set::hidden($type != 'inside')
|
||||
),
|
||||
formBatchItem
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user