diff --git a/module/user/config.php b/module/user/config.php index 8cc60e7efb..6918e3b7a5 100644 --- a/module/user/config.php +++ b/module/user/config.php @@ -6,10 +6,12 @@ $config->user->edit = new stdclass(); $config->user->create->requiredFields = 'account,realname,password,password1,password2'; $config->user->edit->requiredFields = 'account,realname'; -$config->user->customBatchEditFields = 'dept,role,join,email,commiter,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; +$config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; +$config->user->customBatchEditFields = 'dept,email,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; $config->user->custom = new stdclass(); -$config->user->custom->batchedit = 'dept,role,join,email,commiter'; +$config->user->custom->batchcreate = 'dept,email,gender'; +$config->user->custom->batchedit = 'dept,join,email,commiter'; $config->user->failTimes = 6; $config->user->lockMinutes = 10; diff --git a/module/user/control.php b/module/user/control.php index 6d78480b8b..f6b4a247b6 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -442,6 +442,11 @@ class user extends control die(js::locate($this->createLink('company', 'browse'), 'parent')); } + /* Set custom. */ + foreach(explode(',', $this->config->user->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->user->$field; + $this->view->customFields = $customFields; + $this->view->showFields = $this->config->user->custom->batchcreate; + $title = $this->lang->company->common . $this->lang->colon . $this->lang->user->batchCreate; $position[] = $this->lang->user->batchCreate; $this->view->title = $title; diff --git a/module/user/model.php b/module/user/model.php index a089e829da..4327539442 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -284,6 +284,17 @@ class userModel extends model $data[$i]->email = $users->email[$i]; $data[$i]->gender = $users->gender[$i]; $data[$i]->password = md5($users->password[$i]); + $data[$i]->commiter = $users->commiter[$i]; + $data[$i]->join = $users->join[$i]; + $data[$i]->skype = $users->skype[$i]; + $data[$i]->qq = $users->qq[$i]; + $data[$i]->yahoo = $users->yahoo[$i]; + $data[$i]->gtalk = $users->gtalk[$i]; + $data[$i]->wangwang = $users->wangwang[$i]; + $data[$i]->mobile = $users->mobile[$i]; + $data[$i]->phone = $users->phone[$i]; + $data[$i]->address = $users->address[$i]; + $data[$i]->zipcode = $users->zipcode[$i]; $accounts[$i] = $data[$i]->account; $prev['dept'] = $data[$i]->dept; diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 61f88ba83d..98123c678d 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -11,27 +11,49 @@ */ ?> +