* [story#78250,done,0.5h] finish story.
This commit is contained in:
@@ -78,8 +78,8 @@ $config->custom->fieldList['testcase']['createcase'] = 'lib,stage,pri,preconditi
|
||||
$config->custom->fieldList['testreport'] = 'begin,end,members,report';
|
||||
$config->custom->fieldList['testtask'] = 'owner,pri,desc';
|
||||
$config->custom->fieldList['doc'] = 'keywords,content';
|
||||
$config->custom->fieldList['user']['create'] = 'dept,role,email,commiter';
|
||||
$config->custom->fieldList['user']['edit'] = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
|
||||
$config->custom->fieldList['user']['create'] = 'dept,role,group,email,commiter';
|
||||
$config->custom->fieldList['user']['edit'] = 'dept,role,group,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
|
||||
|
||||
if(!empty($config->setCode))
|
||||
{
|
||||
|
||||
@@ -579,7 +579,7 @@ class customModel extends model
|
||||
if($moduleName == 'user' && $method == 'edit') $this->app->loadConfig('user');
|
||||
foreach(explode(',', $fieldList) as $fieldName)
|
||||
{
|
||||
if($moduleName == 'user' && $method == 'edit' && strpos($this->config->user->contactField, $fieldName) === false) continue;
|
||||
if($moduleName == 'user' && $method == 'edit' && strpos($this->config->user->contactField, $fieldName) === false && !in_array($fieldName, array('dept', 'role', 'group', 'email', 'commiter'))) continue;
|
||||
if($moduleName == 'project' && $fieldName == 'budget' && $this->config->vision == 'lite') continue;
|
||||
if($fieldName == 'comment') $fields[$fieldName] = $this->lang->comment;
|
||||
if(isset($moduleLang->{$fieldName}) && is_string($moduleLang->{$fieldName})) $fields[$fieldName] = $moduleLang->$fieldName;
|
||||
|
||||
@@ -15,6 +15,7 @@ $i = 0;
|
||||
foreach($requiredFields as $method => $requiredField)
|
||||
{
|
||||
$fields = $this->custom->getFormFields($module, $method);
|
||||
|
||||
if(empty($fields)) continue;
|
||||
if($module == 'caselib' and $method == 'createcase') continue;
|
||||
|
||||
|
||||
@@ -172,6 +172,7 @@ formPanel
|
||||
set::control(array("control" => "picker","multiple" => true)),
|
||||
set::name('group[]'),
|
||||
set::items($groupList),
|
||||
set::required(strpos($this->config->user->create->requiredFields, 'group') !== false),
|
||||
set::placeholder($lang->user->placeholder->group)
|
||||
)
|
||||
) : null,
|
||||
|
||||
@@ -97,6 +97,7 @@ formPanel
|
||||
(
|
||||
set::width('1/2'),
|
||||
set::label($lang->user->group),
|
||||
set::required(strpos($this->config->user->edit->requiredFields, 'group') !== false),
|
||||
picker
|
||||
(
|
||||
set::name('group[]'),
|
||||
|
||||
Reference in New Issue
Block a user