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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-01-19 11:26:29 +08:00
parent b124221fad b7d6c409d5
commit d2f2554ac4
4 changed files with 88 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update20.0.beta3.sql
+35 -2
View File
@@ -1,15 +1,48 @@
INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(1, 'product', 'dashboard'),
(1, 'my', 'preference'),
(1, 'my', 'uploadAvatar'),
(1, 'user', 'cropAvatar'),
(2, 'product', 'dashboard'),
(2, 'my', 'preference'),
(2, 'my', 'uploadAvatar'),
(2, 'user', 'cropAvatar'),
(3, 'product', 'dashboard'),
(3, 'my', 'preference'),
(3, 'my', 'uploadAvatar'),
(3, 'user', 'cropAvatar'),
(4, 'product', 'dashboard'),
(4, 'my', 'preference'),
(4, 'my', 'uploadAvatar'),
(4, 'user', 'cropAvatar'),
(5, 'product', 'dashboard'),
(5, 'my', 'preference'),
(5, 'my', 'uploadAvatar'),
(5, 'user', 'cropAvatar'),
(6, 'product', 'dashboard'),
(6, 'my', 'preference'),
(6, 'my', 'uploadAvatar'),
(6, 'user', 'cropAvatar'),
(7, 'product', 'dashboard'),
(7, 'my', 'preference'),
(7, 'my', 'uploadAvatar'),
(7, 'user', 'cropAvatar'),
(8, 'product', 'dashboard'),
(8, 'my', 'preference'),
(8, 'my', 'uploadAvatar'),
(8, 'user', 'cropAvatar'),
(9, 'product', 'dashboard'),
(9, 'my', 'preference'),
(9, 'my', 'uploadAvatar'),
(9, 'user', 'cropAvatar'),
(10, 'product', 'dashboard'),
(11, 'product', 'dashboard');
(10, 'my', 'preference'),
(10, 'my', 'uploadAvatar'),
(10, 'user', 'cropAvatar'),
(11, 'product', 'dashboard'),
(11, 'my', 'preference'),
(11, 'my', 'uploadAvatar'),
(11, 'user', 'cropAvatar');
REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'program', '', 'unitList', 'CNY,USD');
REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'program', '', 'mainCurrency', 'CNY');
db/zentao.sql
+35
View File
@@ -1667,6 +1667,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(1, 'my', 'editProfile'),
(1, 'my', 'index'),
(1, 'my', 'profile'),
(1, 'my', 'preference'),
(1, 'my', 'uploadAvatar'),
(1, 'my', 'project'),
(1, 'my', 'story'),
(1, 'my', 'task'),
@@ -1965,6 +1967,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(1, 'user', 'dynamic'),
(1, 'user', 'edit'),
(1, 'user', 'manageContacts'),
(1, 'user', 'cropAvatar'),
(1, 'user', 'profile'),
(1, 'user', 'project'),
(1, 'user', 'story'),
@@ -2031,6 +2034,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(2, 'my', 'editProfile'),
(2, 'my', 'index'),
(2, 'my', 'profile'),
(2, 'my', 'uploadAvatar'),
(2, 'my', 'preference'),
(2, 'my', 'project'),
(2, 'my', 'story'),
(2, 'my', 'task'),
@@ -2164,6 +2169,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(2, 'user', 'dynamic'),
(2, 'user', 'manageContacts'),
(2, 'user', 'profile'),
(2, 'user', 'cropAvatar'),
(2, 'user', 'cropAvatar'),
(2, 'user', 'project'),
(2, 'user', 'story'),
(2, 'user', 'task'),
@@ -2225,6 +2232,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(3, 'my', 'editProfile'),
(3, 'my', 'index'),
(3, 'my', 'profile'),
(3, 'my', 'uploadAvatar'),
(3, 'my', 'preference'),
(3, 'my', 'project'),
(3, 'my', 'story'),
(3, 'my', 'task'),
@@ -2395,6 +2404,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(3, 'user', 'dynamic'),
(3, 'user', 'manageContacts'),
(3, 'user', 'profile'),
(3, 'user', 'cropAvatar'),
(3, 'user', 'project'),
(3, 'user', 'story'),
(3, 'user', 'task'),
@@ -2480,6 +2490,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(4, 'my', 'editProfile'),
(4, 'my', 'index'),
(4, 'my', 'profile'),
(4, 'my', 'uploadAvatar'),
(4, 'my', 'preference'),
(4, 'my', 'project'),
(4, 'my', 'story'),
(4, 'my', 'task'),
@@ -2660,6 +2672,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(4, 'user', 'dynamic'),
(4, 'user', 'manageContacts'),
(4, 'user', 'profile'),
(4, 'user', 'cropAvatar'),
(4, 'user', 'project'),
(4, 'user', 'story'),
(4, 'user', 'task'),
@@ -2735,6 +2748,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(5, 'my', 'editProfile'),
(5, 'my', 'index'),
(5, 'my', 'profile'),
(5, 'my', 'uploadAvatar'),
(5, 'my', 'preference'),
(5, 'my', 'project'),
(5, 'my', 'story'),
(5, 'my', 'task'),
@@ -2950,6 +2965,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(5, 'user', 'dynamic'),
(5, 'user', 'manageContacts'),
(5, 'user', 'profile'),
(5, 'user', 'cropAvatar'),
(5, 'user', 'project'),
(5, 'user', 'story'),
(5, 'user', 'task'),
@@ -3035,6 +3051,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(6, 'my', 'editProfile'),
(6, 'my', 'index'),
(6, 'my', 'profile'),
(6, 'my', 'uploadAvatar'),
(6, 'my', 'preference'),
(6, 'my', 'project'),
(6, 'my', 'story'),
(6, 'my', 'task'),
@@ -3197,6 +3215,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(6, 'user', 'dynamic'),
(6, 'user', 'manageContacts'),
(6, 'user', 'profile'),
(6, 'user', 'cropAvatar'),
(6, 'user', 'project'),
(6, 'user', 'story'),
(6, 'user', 'task'),
@@ -3272,6 +3291,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(7, 'my', 'editProfile'),
(7, 'my', 'index'),
(7, 'my', 'profile'),
(7, 'my', 'uploadAvatar'),
(7, 'my', 'preference'),
(7, 'my', 'project'),
(7, 'my', 'story'),
(7, 'my', 'task'),
@@ -3456,6 +3477,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(7, 'user', 'dynamic'),
(7, 'user', 'manageContacts'),
(7, 'user', 'profile'),
(7, 'user', 'cropAvatar'),
(7, 'user', 'project'),
(7, 'user', 'story'),
(7, 'user', 'task'),
@@ -3535,6 +3557,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(8, 'my', 'editProfile'),
(8, 'my', 'index'),
(8, 'my', 'profile'),
(8, 'my', 'uploadAvatar'),
(8, 'my', 'preference'),
(8, 'my', 'project'),
(8, 'my', 'story'),
(8, 'my', 'task'),
@@ -3726,6 +3750,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(8, 'user', 'dynamic'),
(8, 'user', 'manageContacts'),
(8, 'user', 'profile'),
(8, 'user', 'cropAvatar'),
(8, 'user', 'project'),
(8, 'user', 'story'),
(8, 'user', 'task'),
@@ -3786,6 +3811,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(9, 'my', 'editProfile'),
(9, 'my', 'index'),
(9, 'my', 'profile'),
(9, 'my', 'uploadAvatar'),
(9, 'my', 'preference'),
(9, 'my', 'project'),
(9, 'my', 'story'),
(9, 'my', 'task'),
@@ -3906,6 +3933,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(9, 'user', 'edit'),
(9, 'user', 'manageContacts'),
(9, 'user', 'profile'),
(9, 'user', 'cropAvatar'),
(9, 'user', 'project'),
(9, 'user', 'story'),
(9, 'user', 'task'),
@@ -3946,6 +3974,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(10, 'my', 'editProfile'),
(10, 'my', 'index'),
(10, 'my', 'profile'),
(10, 'my', 'uploadAvatar'),
(10, 'my', 'preference'),
(10, 'my', 'task'),
(10, 'my', 'todo'),
(10, 'my', 'calendar'),
@@ -4029,6 +4059,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(10, 'user', 'bug'),
(10, 'user', 'dynamic'),
(10, 'user', 'profile'),
(10, 'user', 'cropAvatar'),
(10, 'user', 'project'),
(10, 'user', 'story'),
(10, 'user', 'task'),
@@ -4058,6 +4089,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(11, 'index', 'index'),
(11, 'misc', 'ping'),
(11, 'my', 'index'),
(11, 'my', 'profile'),
(11, 'my', 'uploadAvatar'),
(11, 'my', 'preference'),
(11, 'product', 'browse'),
(11, 'product', 'doc'),
(11, 'product', 'dynamic'),
@@ -4123,6 +4157,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(11, 'user', 'bug'),
(11, 'user', 'dynamic'),
(11, 'user', 'profile'),
(11, 'user', 'cropAvatar'),
(11, 'user', 'project'),
(11, 'user', 'story'),
(11, 'user', 'task'),
module/group/lang/resource.php
+16 -12
View File
@@ -91,6 +91,7 @@ $lang->resource->my->work = 'work';
$lang->resource->my->contribute = 'contribute';
$lang->resource->my->project = 'project';
$lang->resource->my->profile = 'profile';
$lang->resource->my->uploadAvatar = 'uploadAvatar';
$lang->resource->my->preference = 'preference';
$lang->resource->my->dynamic = 'dynamic';
$lang->resource->my->editProfile = 'editProfile';
@@ -107,15 +108,16 @@ $lang->my->methodOrder[10] = 'work';
$lang->my->methodOrder[15] = 'contribute';
$lang->my->methodOrder[20] = 'project';
$lang->my->methodOrder[25] = 'profile';
$lang->my->methodOrder[30] = 'preference';
$lang->my->methodOrder[35] = 'dynamic';
$lang->my->methodOrder[40] = 'editProfile';
$lang->my->methodOrder[45] = 'changePassword';
$lang->my->methodOrder[50] = 'manageContacts';
$lang->my->methodOrder[55] = 'deleteContacts';
$lang->my->methodOrder[60] = 'score';
$lang->my->methodOrder[65] = 'unbind';
$lang->my->methodOrder[70] = 'team';
$lang->my->methodOrder[30] = 'uploadAvatar';
$lang->my->methodOrder[35] = 'preference';
$lang->my->methodOrder[40] = 'dynamic';
$lang->my->methodOrder[45] = 'editProfile';
$lang->my->methodOrder[50] = 'changePassword';
$lang->my->methodOrder[55] = 'manageContacts';
$lang->my->methodOrder[60] = 'deleteContacts';
$lang->my->methodOrder[65] = 'score';
$lang->my->methodOrder[70] = 'unbind';
$lang->my->methodOrder[75] = 'team';
/* Todo. */
$lang->resource->todo = new stdclass();
@@ -1315,6 +1317,7 @@ $lang->resource->user->execution = 'execution';
$lang->resource->user->issue = 'issue';
$lang->resource->user->risk = 'risk';
$lang->resource->user->dynamic = 'dynamic';
$lang->resource->user->cropAvatar = 'cropAvatar';
$lang->resource->user->profile = 'profile';
$lang->resource->user->batchEdit = 'batchEdit';
$lang->resource->user->unbind = 'unbind';
@@ -1332,9 +1335,10 @@ $lang->user->methodOrder[40] = 'bug';
$lang->user->methodOrder[45] = 'project';
$lang->user->methodOrder[50] = 'dynamic';
$lang->user->methodOrder[55] = 'profile';
$lang->user->methodOrder[60] = 'batchEdit';
$lang->user->methodOrder[75] = 'unbind';
$lang->user->methodOrder[80] = 'setPublicTemplate';
$lang->user->methodOrder[60] = 'profile';
$lang->user->methodOrder[65] = 'batchEdit';
$lang->user->methodOrder[70] = 'unbind';
$lang->user->methodOrder[75] = 'setPublicTemplate';
/* Tree. */
$lang->resource->tree = new stdclass();
module/user/lang/zh-cn.php
+2 -2
View File
@@ -52,8 +52,8 @@ $lang->user->verifyPassword = '您的密码';
$lang->user->resetPassword = '忘记密码';
$lang->user->score = '积分';
$lang->user->name = '名称';
$lang->user->cropAvatar = '裁剪头像';
$lang->user->cropAvatarTip = '拖拽选框来选择头像裁剪范围';
$lang->user->cropAvatar = '剪切头像';
$lang->user->cropAvatarTip = '拖拽选框来选择头像剪切范围';
$lang->user->cropImageTip = '所使用的头像图片过小，建议图片大小至少为 48x48，当前图片大小为 %s';
$lang->user->legendBasic = '基本资料';