diff --git a/module/custom/control.php b/module/custom/control.php index 4d0680144f..6667281247 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -79,6 +79,11 @@ class custom extends control $this->app->loadConfig('user'); $this->view->showDeleted = isset($this->config->user->showDeleted) ? $this->config->user->showDeleted : '0'; } + if($module == 'user' and $field == 'showField') + { + $this->app->loadConfig('user'); + $this->view->showFields = isset($this->config->user->showFields) ? $this->config->user->showFields : ''; + } if(strtolower($this->server->request_method) == "post") { @@ -112,6 +117,11 @@ class custom extends control $data = fixer::input('post')->get(); $this->loadModel('setting')->setItem('system.user.showDeleted', $data->showDeleted); } + elseif($module == 'user' and $field == 'showField') + { + $data = fixer::input('post')->join('showFields', ',')->get(); + $this->loadModel('setting')->setItem('system.user.showFields', $data->showFields); + } else { $lang = $_POST['lang']; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index d83a4fca8e..fad34b2c31 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -75,6 +75,7 @@ $lang->custom->user = new stdClass(); $lang->custom->user->fields['roleList'] = 'Role'; $lang->custom->user->fields['statusList'] = 'Status'; $lang->custom->user->fields['deleted'] = 'Deleted User'; +$lang->custom->user->fields['showField'] = 'Show Field'; $lang->custom->block->fields['closed'] = 'Closed Block'; @@ -84,6 +85,7 @@ $lang->custom->allLang = 'All Language'; $lang->custom->confirmRestore = 'Do you want to reset to Default?'; $lang->custom->notice = new stdclass(); +$lang->custom->notice->userFieldNotice = 'Control whether the above fields are displayed on the user-related page, and leave blank to display all'; $lang->custom->notice->canNotAdd = 'It will be calculated, so customization is not enabled.'; $lang->custom->notice->forceReview = '%s Review is required for certain submitters.'; $lang->custom->notice->forceNotReview = "%s Review is NOT required for certain submitters."; @@ -109,6 +111,11 @@ $lang->custom->reviewList[0] = 'Off'; $lang->custom->deletedList[1] = 'Show'; $lang->custom->deletedList[0] = 'Hide'; +$lang->custom->userFieldList['wechat'] = 'Wechat'; +$lang->custom->userFieldList['dingding'] = 'Dingding'; +$lang->custom->userFieldList['slact'] = 'Slact'; +$lang->custom->userFieldList['whatsapp'] = 'WhatsApp'; + $lang->custom->workingHours = 'hours/day'; $lang->custom->weekend = 'Weekend'; $lang->custom->weekendList[2] = '2-Day Off'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 98b09eedd9..e0af6e6cdc 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -75,6 +75,7 @@ $lang->custom->user = new stdClass(); $lang->custom->user->fields['roleList'] = '职位'; $lang->custom->user->fields['statusList'] = '状态'; $lang->custom->user->fields['deleted'] = '列出已删除用户'; +$lang->custom->user->fields['showField'] = '显示字段'; $lang->custom->block->fields['closed'] = '关闭的区块'; @@ -84,6 +85,7 @@ $lang->custom->allLang = '适用所有语言'; $lang->custom->confirmRestore = '是否要恢复默认配置?'; $lang->custom->notice = new stdclass(); +$lang->custom->notice->userFieldNotice = '控制以上字段在用户相关页面是否显示,留空则全显示'; $lang->custom->notice->canNotAdd = '该项参与运算,不提供自定义添加功能'; $lang->custom->notice->forceReview = "指定人提交的%s必须评审。"; $lang->custom->notice->forceNotReview = "指定人提交的%s不需要评审。"; @@ -109,6 +111,11 @@ $lang->custom->reviewList[0] = '关闭'; $lang->custom->deletedList[1] = '列出'; $lang->custom->deletedList[0] = '不列出'; +$lang->custom->userFieldList['wechat'] = '微信'; +$lang->custom->userFieldList['dingding'] = '钉钉'; +$lang->custom->userFieldList['slact'] = 'Slact'; +$lang->custom->userFieldList['whatsapp'] = 'WhatsApp'; + $lang->custom->workingHours = '每天可用工时'; $lang->custom->weekend = '休息日'; $lang->custom->weekendList[2] = '双休'; diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 92ae3c6ab7..c1d692cf20 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -124,6 +124,21 @@ EOT; + + + + + + + + + + + + + + +
custom->user->fields['showField'];?>custom->userFieldList, $showFields, "class='form-control chosen' multiple");?>
custom->notice->userFieldNotice;?>
diff --git a/module/user/lang/en.php b/module/user/lang/en.php index ea2cd16027..a878dbe98e 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -30,6 +30,10 @@ $lang->user->verify = 'Verification'; $lang->user->contactInfo = 'Contact'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; +$lang->user->wechat = 'Wechat'; +$lang->user->dingding = 'Dingding'; +$lang->user->slack = 'Slack'; +$lang->user->whatsapp = 'WhatsApp'; $lang->user->gtalk = 'GTalk'; $lang->user->mobile = 'Mobile'; $lang->user->phone = 'Phone'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 4aed2b9eb2..f19e8d8bd5 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -30,6 +30,10 @@ $lang->user->verify = '安全验证'; $lang->user->contactInfo = '联系信息'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; +$lang->user->wechat = '微信'; +$lang->user->dingding = '钉钉'; +$lang->user->slack = 'Slack'; +$lang->user->whatsapp = 'WhatsApp'; $lang->user->gtalk = 'GTalk'; $lang->user->mobile = '手机'; $lang->user->phone = '电话'; diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 274433ba1e..de62af1e4b 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -94,6 +94,26 @@ + + user->showFields) or (strpos($config->user->showFields, 'wechat') !== false)):?> + + + + user->showFields) or (strpos($config->user->showFields, 'dingding') !== false)):?> + + + + + + user->showFields) or (strpos($config->user->showFields, 'slack') !== false)):?> + + + + user->showFields) or (strpos($config->user->showFields, 'whatsapp') !== false)):?> + + + +
user->address;?> address, "class='form-control'");?>
user->wechat;?>wechat, "class='form-control'");?>user->dingding;?>dingding, "class='form-control'");?>
user->slack;?>slack, "class='form-control'");?>user->whatsapp;?>whatsapp, "class='form-control'");?>
user->zipcode;?> zipcode, "class='form-control'");?>