From 3daae171f027709c1cad885cc18d1dee59b5a66d Mon Sep 17 00:00:00 2001 From: Yagami Date: Sat, 23 Feb 2019 13:44:51 +0800 Subject: [PATCH] * Delete yahoo and wangwang field. --- db/update11.2.sql | 6 ++++++ module/company/config.php | 4 ---- module/my/view/editprofile.html.php | 14 ++++---------- module/my/view/profile.html.php | 8 -------- module/user/config.php | 4 ++-- module/user/lang/en.php | 2 -- module/user/lang/zh-cn.php | 2 -- module/user/lang/zh-tw.php | 2 -- module/user/model.php | 4 ---- module/user/view/batchcreate.html.php | 4 ---- module/user/view/batchedit.html.php | 4 ---- module/user/view/edit.html.php | 14 ++++---------- module/user/view/profile.html.php | 8 -------- 13 files changed, 16 insertions(+), 60 deletions(-) diff --git a/db/update11.2.sql b/db/update11.2.sql index c049c96631..9f5f3af376 100644 --- a/db/update11.2.sql +++ b/db/update11.2.sql @@ -1,3 +1,9 @@ update `zt_build` set `deleted`='1' where `project`='0' and `id` in (select `build` from `zt_release` where `deleted`='1'); ALTER TABLE `zt_productplan` ADD `parent` mediumint(9) NOT NULL DEFAULT '0' AFTER `branch`; ALTER TABLE `zt_action` CHANGE `actor` `actor` varchar(100) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `project`; + +ALTER TABLE `zt_user` +ADD `wechat` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `qq`, +ADD `dingding` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `wechat`, +ADD `slack` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `dingding`, +ADD `whatsapp` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `slack`; diff --git a/module/company/config.php b/module/company/config.php index f26840fd9d..cd47675c49 100644 --- a/module/company/config.php +++ b/module/company/config.php @@ -38,9 +38,7 @@ $config->company->browse->search['fields']['commiter'] = $lang->user->commiter; $config->company->browse->search['fields']['gender'] = $lang->user->gender; $config->company->browse->search['fields']['qq'] = $lang->user->qq; $config->company->browse->search['fields']['skype'] = $lang->user->skype; -$config->company->browse->search['fields']['yahoo'] = $lang->user->yahoo; $config->company->browse->search['fields']['gtalk'] = $lang->user->gtalk; -$config->company->browse->search['fields']['wangwang'] = $lang->user->wangwang; $config->company->browse->search['fields']['address'] = $lang->user->address; $config->company->browse->search['fields']['zipcode'] = $lang->user->zipcode; @@ -56,8 +54,6 @@ $config->company->browse->search['params']['commiter'] = array('operator' => 'in $config->company->browse->search['params']['gender'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->user->genderList); $config->company->browse->search['params']['qq'] = array('operator' => '=', 'control' => 'input', 'values' => ''); $config->company->browse->search['params']['skype'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->company->browse->search['params']['yahoo'] = array('operator' => '=', 'control' => 'input', 'values' => ''); $config->company->browse->search['params']['gtalk'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->company->browse->search['params']['wangwang'] = array('operator' => '=', 'control' => 'input', 'values' => ''); $config->company->browse->search['params']['address'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->company->browse->search['params']['zipcode'] = array('operator' => '=', 'control' => 'input', 'values' => ''); diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index 943ab8bc03..8145efb7be 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -64,22 +64,16 @@ - - + + - - + + - - - - - - diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index 4df8419a71..5fbdf7a51e 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -91,18 +91,10 @@ - - - - - - - - diff --git a/module/user/config.php b/module/user/config.php index 44eb60792e..afb00d80a7 100644 --- a/module/user/config.php +++ b/module/user/config.php @@ -6,8 +6,8 @@ $config->user->edit = new stdclass(); $config->user->create->requiredFields = 'account,realname,password,password1,password2'; $config->user->edit->requiredFields = 'account,realname'; -$config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; -$config->user->customBatchEditFields = 'dept,email,commiter,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; +$config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,gtalk,mobile,phone,address,zipcode'; +$config->user->customBatchEditFields = 'dept,email,commiter,skype,qq,gtalk,mobile,phone,address,zipcode'; $config->user->custom = new stdclass(); $config->user->custom->batchCreateFields = 'dept,join,email,gender'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index ca47dd68ea..ea2cd16027 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -30,9 +30,7 @@ $lang->user->verify = 'Verification'; $lang->user->contactInfo = 'Contact'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; -$lang->user->yahoo = 'Yahoo!'; $lang->user->gtalk = 'GTalk'; -$lang->user->wangwang = 'Wangwang'; $lang->user->mobile = 'Mobile'; $lang->user->phone = 'Phone'; $lang->user->address = 'Address'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 77be8eb808..4aed2b9eb2 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -30,9 +30,7 @@ $lang->user->verify = '安全验证'; $lang->user->contactInfo = '联系信息'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; -$lang->user->yahoo = '雅虎通'; $lang->user->gtalk = 'GTalk'; -$lang->user->wangwang = '旺旺'; $lang->user->mobile = '手机'; $lang->user->phone = '电话'; $lang->user->address = '通讯地址'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index 46b8da6f03..151e0cfdfd 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -30,9 +30,7 @@ $lang->user->verify = '安全驗證'; $lang->user->contactInfo = '聯繫信息'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; -$lang->user->yahoo = '雅虎通'; $lang->user->gtalk = 'GTalk'; -$lang->user->wangwang = '旺旺'; $lang->user->mobile = '手機'; $lang->user->phone = '電話'; $lang->user->address = '通訊地址'; diff --git a/module/user/model.php b/module/user/model.php index 9d4ba6d0ae..78a8c92e92 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -300,9 +300,7 @@ class userModel extends model $data[$i]->join = empty($users->join[$i]) ? '0000-00-00' : ($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]; @@ -474,9 +472,7 @@ class userModel extends model $users[$id]['join'] = $data->join[$id]; $users[$id]['skype'] = $data->skype[$id]; $users[$id]['qq'] = $data->qq[$id]; - $users[$id]['yahoo'] = $data->yahoo[$id]; $users[$id]['gtalk'] = $data->gtalk[$id]; - $users[$id]['wangwang'] = $data->wangwang[$id]; $users[$id]['mobile'] = $data->mobile[$id]; $users[$id]['phone'] = $data->phone[$id]; $users[$id]['address'] = $data->address[$id]; diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 33dd92e7fc..53f86ffa9c 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -47,9 +47,7 @@ - - @@ -82,9 +80,7 @@ - - diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index b1298b43d0..2d3bc3093f 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -43,9 +43,7 @@ - - @@ -73,9 +71,7 @@ - - diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index d898d57dcc..274433ba1e 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -77,22 +77,16 @@
my->form->lblContact;?>
user->skype;?>skype, "class='form-control'");?>user->mobile;?>mobile, "class='form-control'");?> user->qq;?> qq, "class='form-control'");?>
user->yahoo;?>yahoo, "class='form-control'");?>user->skype;?>skype, "class='form-control'");?> user->gtalk;?> gtalk, "class='form-control'");?>
user->wangwang;?>wangwang, "class='form-control'");?>user->mobile;?>mobile, "class='form-control'");?>
user->phone;?>user->qq;?> qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
user->yahoo;?>yahoo;?>
user->gtalk;?> gtalk;?>
user->wangwang;?>wangwang;?>
user->mobile;?> mobile;?>'> user->join;?> '> user->skype;?> '> user->qq;?>'> user->yahoo;?> '> user->gtalk;?>'>user->wangwang;?> '> user->mobile;?> '> user->phone;?> '> user->address;?>'> '> '> '> '> '> '> '> '> '> user->join;?> '> user->skype;?> '> user->qq;?>'> user->yahoo;?> '> user->gtalk;?>'> user->wangwang;?> '> user->mobile;?> '> user->phone;?> '> user->address;?>'> id]", $user->join, "class='form-control form-date'");?> '> id]", $user->skype, "class='form-control'");?> '> id]", $user->qq, "class='form-control'");?>'> id]", $user->yahoo, "class='form-control'");?> '> id]", $user->gtalk, "class='form-control'");?>'>id]", $user->wangwang, "class='form-control'");?> '> id]", $user->mobile, "class='form-control'");?> '> id]", $user->phone, "class='form-control'");?> '> id]", $user->address, "class='form-control'");?>
- - + + - - - - - - - - + + diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php index c02bed9610..b1252309fa 100644 --- a/module/user/view/profile.html.php +++ b/module/user/view/profile.html.php @@ -99,18 +99,10 @@ - - - - - - - -
user->contactInfo;?>
user->skype;?>skype, "class='form-control'");?>user->mobile;?>mobile, "class='form-control'");?> user->qq;?> qq, "class='form-control'");?>
user->yahoo;?>yahoo, "class='form-control'");?> user->gtalk;?> gtalk, "class='form-control'");?>
user->wangwang;?>wangwang, "class='form-control'");?>user->mobile;?>mobile, "class='form-control'");?>user->skype;?>skype, "class='form-control'");?>
user->phone;?>user->qq;?> qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
user->yahoo;?>yahoo;?>
user->gtalk;?> gtalk;?>
user->wangwang;?>wangwang;?>
user->mobile;?> mobile;?>