Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* task#980, add role field to user table.

Browse Source
This commit is contained in:
wangchunsheng
2012-12-13 05:27:14 +00:00
parent 582bba412d
commit 1d1da6da8f
10 changed files with 127 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
db/update4.0.beta1.sql
View File

@@ -1,23 +1,2 @@
INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
(1, 1, 'bug', 'batchEdit'),
(1, 2, 'bug', 'batchEdit'),
(1, 3, 'bug', 'batchEdit'),
(1, 4, 'bug', 'batchEdit'),
(1, 5, 'bug', 'batchEdit'),
(1, 1, 'testcase', 'batchEdit'),
(1, 2, 'testcase', 'batchEdit'),
(1, 3, 'testcase', 'batchEdit'),
(1, 4, 'testcase', 'batchEdit'),
(1, 5, 'testcase', 'batchEdit'),
(1, 1, 'story', 'batchEdit'),
(1, 2, 'story', 'batchEdit'),
(1, 3, 'story', 'batchEdit'),
(1, 4, 'story', 'batchEdit'),
(1, 5, 'story', 'batchEdit'),
(1, 1, 'todo', 'batchEdit'),
(1, 2, 'todo', 'batchEdit'),
(1, 3, 'todo', 'batchEdit'),
(1, 4, 'todo', 'batchEdit'),
(1, 5, 'todo', 'batchEdit');
ALTER TABLE `zt_testtask` ADD `pri` TINYINT( 3 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `owner`;
ALTER TABLE `zt_user` ADD `role` CHAR( 10 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' AFTER `password`;

14
module/company/config.php
View File

@@ -35,6 +35,7 @@ $config->company->browse->search['fields']['account'] = $lang->user->account;
$config->company->browse->search['fields']['phone'] = $lang->user->phone;
$config->company->browse->search['fields']['join'] = $lang->user->join;
$config->company->browse->search['fields']['id'] = $lang->user->id;
$config->company->browse->search['fields']['role'] = $lang->user->role;
$config->company->browse->search['fields']['commiter'] = $lang->user->commiter;
$config->company->browse->search['fields']['birthday'] = $lang->user->birthyear;
$config->company->browse->search['fields']['gender'] = $lang->user->gender;
@@ -46,14 +47,17 @@ $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;
$config->company->browse->search['params']['realname'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['email'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['dept'] = array('operator' => 'belong', 'control' => 'select', 'values' => '');
$config->company->browse->search['params']['realname'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['account'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['account'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['phone'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['join'] = array('operator' => '>=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->company->browse->search['params']['id'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['role'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->user->roleList);
$config->company->browse->search['params']['commiter'] = array('operator' => 'include', 'control' => 'select', 'values' => '');
$config->company->browse->search['params']['email'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['birthday'] = array('operator' => '>=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->company->browse->search['params']['gender'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->user->genderList);
$config->company->browse->search['params']['phone'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['qq'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['msn'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->company->browse->search['params']['yahoo'] = array('operator' => '=', 'control' => 'input', 'values' => '');
@@ -61,5 +65,3 @@ $config->company->browse->search['params']['gtalk'] = array('operator' => '='
$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' => '');
$config->company->browse->search['params']['join'] = array('operator' => '>=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->company->browse->search['params']['id'] = array('operator' => '=', 'control' => 'input', 'values' => '');

10
module/company/view/browse.html.php
View File

@@ -41,14 +41,14 @@ include '../../common/view/tablesorter.html.php';
<th class='w-id'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->user->realname;?></th>
<th><?php echo $lang->user->account;?></th>
<?php // echo $lang->user->nickname;?>
<th><?php echo $lang->user->role;?></th>
<th><?php echo $lang->user->email;?></th>
<th><?php echo $lang->user->gender;?></th>
<th><?php echo $lang->user->phone;?></th>
<th><?php echo $lang->user->join;?></th>
<th><?php echo $lang->user->last;?></th>
<th><?php echo $lang->user->visits;?></th>
<th><?php echo $lang->actions;?></th>
<th class='w-80px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -57,14 +57,14 @@ include '../../common/view/tablesorter.html.php';
<td><?php echo $user->id;?></td>
<td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?></td>
<td><?php echo $user->account;?></td>
<?php // echo $user->nickname;?>
<td><?php echo $lang->user->roleList[$user->role];?></td>
<td><?php echo html::mailto($user->email);?></td>
<td><?php if(isset($lang->user->genderList->{$user->gender})) echo $lang->user->genderList->{$user->gender};?></td>
<td><?php if(isset($lang->user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?></td>
<td><?php echo $user->phone;?></td>
<td><?php echo $user->join;?></td>
<td><?php echo date('Y-m-d', $user->last);?></td>
<td><?php echo $user->visits;?></td>
<td class='a-right'>
<td class='a-left'>
<?php
common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
common::printIcon('user', 'delete', "userID=$user->id", '', 'list', '', "hiddenwin");

4
module/my/view/profile.html.php
View File

@@ -42,6 +42,10 @@
<th class='rowhead'><?php echo $lang->user->realname;?></th>
<td><?php echo $user->realname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->role;?></th>
<td><?php echo $lang->user->roleList[$user->role];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->commiter;?></th>
<td><?php echo $user->commiter;?></td>

4
module/user/config.php
View File

@@ -3,8 +3,8 @@ $config->user = new stdclass();
$config->user->create = new stdclass();
$config->user->edit = new stdclass();
$config->user->create->requiredFields = 'account,realname,password,password1,password2';
$config->user->edit->requiredFields = 'account,realname';
$config->user->create->requiredFields = 'account,realname,password,password1,password2,role';
$config->user->edit->requiredFields = 'account,realname,role';
$config->user->failTimes = 6;
$config->user->lockMinutes = 10;
$config->user->batchCreate = 10;

74
module/user/lang/en.php
View File

@@ -9,7 +9,36 @@
* @version $Id$
* @link http://www.zentao.net
*/
$lang->user->common = 'User';
$lang->user->common = 'User';
$lang->user->id = 'ID';
$lang->user->company = 'Company';
$lang->user->dept = 'Department';
$lang->user->account = 'Account';
$lang->user->password = 'Password';
$lang->user->password2 = 'Repeat password';
$lang->user->role = 'Role';
$lang->user->realname = 'Fullname';
$lang->user->nickname = 'Nickname';
$lang->user->commiter = 'Commit account';
$lang->user->avatar = 'Avatar';
$lang->user->birthyear = 'Birth year';
$lang->user->gender = 'Gender';
$lang->user->email = 'Email';
$lang->user->msn = 'MSN';
$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';
$lang->user->zipcode = 'Zipcode';
$lang->user->join = 'Join date';
$lang->user->visits = 'Visits';
$lang->user->ip = 'Last IP';
$lang->user->last = 'Last login';
$lang->user->status = 'Status';
$lang->user->index = "Index";
$lang->user->view = "Info";
$lang->user->create = "Add";
@@ -51,47 +80,26 @@ $lang->user->loginFailed = "Login failed, please check your account and password
$lang->user->lockWarning = "You only have %s times to try.";
$lang->user->loginLocked = "You try the password too many times, please contact the administrator or try again after %s minutes.";
$lang->user->genderList = new stdclass();
$lang->user->genderList->m = 'Male';
$lang->user->genderList->f = 'Female';
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = 'Dev';
$lang->user->roleList['qa'] = 'QA';
$lang->user->roleList['pm'] = 'PM';
$lang->user->roleList['po'] = 'PO';
$lang->user->genderList['m'] = 'Male';
$lang->user->genderList['f'] = 'Female';
$lang->user->statusList['active'] = 'Activate';
$lang->user->statusList['delete'] = 'Deleted';
$lang->user->keepLogin['on'] = 'Keep login';
$lang->user->loginWithDemoUser = 'Login with demo user:';
$lang->user->id = 'ID';
$lang->user->company = 'Company';
$lang->user->dept = 'Department';
$lang->user->account = 'Account';
$lang->user->password = 'Password';
$lang->user->password2 = 'Repeat password';
$lang->user->realname = 'Fullname';
$lang->user->nickname = 'Nickname';
$lang->user->commiter = 'Commit account';
$lang->user->avatar = 'Avatar';
$lang->user->birthyear = 'Birth year';
$lang->user->gender = 'Gender';
$lang->user->email = 'Email';
$lang->user->msn = 'MSN';
$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';
$lang->user->zipcode = 'Zipcode';
$lang->user->join = 'Join date';
$lang->user->visits = 'Visits';
$lang->user->ip = 'Last IP';
$lang->user->last = 'Last login';
$lang->user->status = 'Status';
$lang->user->placeholder = new stdclass();
$lang->user->placeholder->account = 'Letters/underline/numbers, three above';
$lang->user->placeholder->password1 = 'Six above';
$lang->user->placeholder->join = 'The date the employee join the company';
$lang->user->placeholder->join = 'The date the employee joined the company';
$lang->user->placeholder->commiter = 'The account in version control systems';
$lang->user->error = new stdclass();
$lang->user->error->account = "ID %s，account must be three letters at least";

78
module/user/lang/zh-cn.php
View File

@@ -9,7 +9,36 @@
* @version $Id$
* @link http://www.zentao.net
*/
$lang->user->common = '用户';
$lang->user->common = '用户';
$lang->user->id = '用户编号';
$lang->user->company = '所属公司';
$lang->user->dept = '所属部门';
$lang->user->account = '用户名';
$lang->user->password = '密码';
$lang->user->password2 = '请重复密码';
$lang->user->role = '角色';
$lang->user->realname = '真实姓名';
$lang->user->nickname = '昵称';
$lang->user->commiter = '源代码帐号';
$lang->user->avatar = '头像';
$lang->user->birthyear = '出生年';
$lang->user->gender = '性别';
$lang->user->email = '邮箱';
$lang->user->msn = 'MSN';
$lang->user->qq = 'QQ';
$lang->user->yahoo = '雅虎通';
$lang->user->gtalk = 'GTalk';
$lang->user->wangwang = '旺旺';
$lang->user->mobile = '手机';
$lang->user->phone = '电话';
$lang->user->address = '通讯地址';
$lang->user->zipcode = '邮编';
$lang->user->join = '加入日期';
$lang->user->visits = '访问次数';
$lang->user->ip = '最后IP';
$lang->user->last = '最后登录';
$lang->user->status = '状态';
$lang->user->index = "用户视图首页";
$lang->user->view = "用户详情";
$lang->user->create = "添加用户";
@@ -25,9 +54,9 @@ $lang->user->userView = "人员视图";
$lang->user->editProfile = "修改个人信息";
$lang->user->editPassword = "修改密码";
$lang->user->deny = "访问受限";
$lang->user->confirmDelete = "您确认删除该用户吗？";
$lang->user->confirmActivate = "您确认激活该用户吗？";
$lang->user->confirmUnlock = "您确认解锁该用户吗？";
$lang->user->confirmDelete = "您确定删除该用户吗？";
$lang->user->confirmActivate = "您确定激活该用户吗？";
$lang->user->confirmUnlock = "您确定解除该用户的锁定状态吗？";
$lang->user->relogin = "重新登录";
$lang->user->asGuest = "游客访问";
$lang->user->goback = "返回前一页";
@@ -51,47 +80,26 @@ $lang->user->loginFailed = "登录失败，请检查您的用户名或密码是
$lang->user->lockWarning = "您还有%s次尝试机会。";
$lang->user->loginLocked = "密码尝试次数太多，请联系管理员解锁，或%s分钟后重试。";
$lang->user->genderList = new stdclass();
$lang->user->genderList->m = '男';
$lang->user->genderList->f = '女';
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = '研发';
$lang->user->roleList['qa'] = '测试';
$lang->user->roleList['pm'] = '项目经理';
$lang->user->roleList['po'] = '产品经理';
$lang->user->genderList['m'] = '男';
$lang->user->genderList['f'] = '女';
$lang->user->statusList['active'] = '正常';
$lang->user->statusList['delete'] = '删除';
$lang->user->keepLogin['on'] = '保持登录';
$lang->user->loginWithDemoUser = '使用demo账号登录：';
$lang->user->id = '用户编号';
$lang->user->company = '所属公司';
$lang->user->dept = '所属部门';
$lang->user->account = '用户名';
$lang->user->password = '密码';
$lang->user->password2 = '请重复密码';
$lang->user->realname = '真实姓名';
$lang->user->nickname = '昵称';
$lang->user->commiter = '源代码提交帐号';
$lang->user->avatar = '头像';
$lang->user->birthyear = '出生年';
$lang->user->gender = '性别';
$lang->user->email = '邮箱';
$lang->user->msn = 'MSN';
$lang->user->qq = 'QQ';
$lang->user->yahoo = '雅虎通';
$lang->user->gtalk = 'GTalk';
$lang->user->wangwang = '旺旺';
$lang->user->mobile = '手机';
$lang->user->phone = '电话';
$lang->user->address = '通讯地址';
$lang->user->zipcode = '邮编';
$lang->user->join = '加入日期';
$lang->user->visits = '访问次数';
$lang->user->ip = '最后IP';
$lang->user->last = '最后登录';
$lang->user->status = '状态';
$lang->user->placeholder = new stdclass();
$lang->user->placeholder->account = '英文、数字和下划线的组合，三位以上';
$lang->user->placeholder->password1 = '六位以上';
$lang->user->placeholder->join = '入职日期';
$lang->user->placeholder->commiter = '版本控制系统(subversion)中的帐号';
$lang->user->error = new stdclass();
$lang->user->error->account = "ID %s，用户名必须三位以上";

25
module/user/view/create.html.php
View File

@@ -29,13 +29,25 @@
<td><?php echo html::input('realname', '', "class='text-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->commiter;?></th>
<td><?php echo html::input('commiter', '', "class='text-3'");?></td>
<th class='rowhead'><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password1', '', "class='text-3' autocomplete='off'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2', '', "class='text-3' autocomplete='off'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->role;?></th>
<td><?php echo html::select('role', $lang->user->roleList, '', "class='select-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->email;?></th>
<td><?php echo html::input('email', '', "class='text-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->commiter;?></th>
<td><?php echo html::input('commiter', '', "class='text-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->join;?></th>
<td><?php echo html::input('join', '', "class='text-3 date'");?></td>
@@ -44,14 +56,7 @@
<th class='rowhead'><?php echo $lang->user->gender;?></th>
<td><?php echo html::radio('gender', (array)$lang->user->genderList, 'm');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password1', '', "class='text-3' autocomplete='off'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2', '', "class='text-3' autocomplete='off'");?></td>
</tr>
<tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td></tr>
</table>
</form>

4
module/user/view/edit.html.php
View File

@@ -27,6 +27,10 @@
<th class='rowhead'><?php echo $lang->user->realname;?></th>
<td><?php echo html::input('realname', $user->realname, "class='text-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->role;?></th>
<td><?php echo html::select('role', $lang->user->roleList, $user->role, "class='select-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->commiter;?></th>
<td><?php echo html::input('commiter', $user->commiter, "class='text-3'");?></td>

4
module/user/view/profile.html.php
View File

@@ -42,6 +42,10 @@
<th class='rowhead'><?php echo $lang->user->realname;?></th>
<td><?php echo $user->realname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->role;?></th>
<td><?php echo $lang->user->roleList[$user->role];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->commiter;?></th>
<td><?php echo $user->commiter;?></td>