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

* Finish task #107568.

Browse Source
This commit is contained in:
hufangzhou
2023-12-05 09:31:39 +08:00
parent b3258121b3
commit 48effe7cac
10 changed files with 115 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/zentao.sql
+78
View File
@@ -4629,6 +4629,12 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(1, 'trainchapter', 'sortChapterOrder'),
(1, 'trainchapter', 'view'),
(1, 'traincourse', 'browse'),
(1, 'traincourse', 'viewCourse'),
(1, 'traincourse', 'viewChapter'),
(1, 'traincourse', 'practice'),
(1, 'traincourse', 'practiceBrowse'),
(1, 'traincourse', 'practiceView'),
(1, 'traincourse', 'updatePractice'),
(1, 'traincourse', 'changeStatus'),
(1, 'traincourse', 'collect'),
(1, 'traincourse', 'create'),
@@ -5531,6 +5537,12 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(2, 'trainchapter', 'sortChapterOrder'),
(2, 'trainchapter', 'view'),
(2, 'traincourse', 'browse'),
(2, 'traincourse', 'viewCourse'),
(2, 'traincourse', 'viewChapter'),
(2, 'traincourse', 'practice'),
(2, 'traincourse', 'practiceBrowse'),
(2, 'traincourse', 'practiceView'),
(2, 'traincourse', 'updatePractice'),
(2, 'traincourse', 'create'),
(2, 'traincourse', 'delete'),
(2, 'traincourse', 'edit'),
@@ -6203,6 +6215,13 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(3, 'trainbook', 'browse'),
(3, 'trainplan', 'browse'),
(3, 'trainplan', 'view'),
(3, 'traincourse', 'browse'),
(3, 'traincourse', 'viewCourse'),
(3, 'traincourse', 'viewChapter'),
(3, 'traincourse', 'practice'),
(3, 'traincourse', 'practiceBrowse'),
(3, 'traincourse', 'practiceView'),
(3, 'traincourse', 'updatePractice'),
(3, 'user', 'bug'),
(3, 'user', 'cropAvatar'),
(3, 'user', 'dynamic'),
@@ -7210,6 +7229,12 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(4, 'trainchapter', 'showDocFiles'),
(4, 'trainchapter', 'view'),
(4, 'traincourse', 'browse'),
(4, 'traincourse', 'viewCourse'),
(4, 'traincourse', 'viewChapter'),
(4, 'traincourse', 'practice'),
(4, 'traincourse', 'practiceBrowse'),
(4, 'traincourse', 'practiceView'),
(4, 'traincourse', 'updatePractice'),
(4, 'traincourse', 'collect'),
(4, 'traincourse', 'view'),
(4, 'trainexam', 'browse'),
@@ -8176,6 +8201,13 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(5, 'todo', 'import2Today'),
(5, 'todo', 'start'),
(5, 'todo', 'view'),
(5, 'traincourse', 'browse'),
(5, 'traincourse', 'viewCourse'),
(5, 'traincourse', 'viewChapter'),
(5, 'traincourse', 'practice'),
(5, 'traincourse', 'practiceBrowse'),
(5, 'traincourse', 'practiceView'),
(5, 'traincourse', 'updatePractice'),
(5, 'tree', 'browse'),
(5, 'tree', 'browseTask'),
(5, 'tree', 'delete'),
@@ -8961,6 +8993,13 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(6, 'todo', 'import2Today'),
(6, 'todo', 'start'),
(6, 'todo', 'view'),
(6, 'traincourse', 'browse'),
(6, 'traincourse', 'viewCourse'),
(6, 'traincourse', 'viewChapter'),
(6, 'traincourse', 'practice'),
(6, 'traincourse', 'practiceBrowse'),
(6, 'traincourse', 'practiceView'),
(6, 'traincourse', 'updatePractice'),
(6, 'trainplan', 'batchCreate'),
(6, 'trainplan', 'batchEdit'),
(6, 'trainplan', 'batchFinish'),
@@ -9791,6 +9830,13 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(7, 'todo', 'import2Today'),
(7, 'todo', 'start'),
(7, 'todo', 'view'),
(7, 'traincourse', 'browse'),
(7, 'traincourse', 'viewCourse'),
(7, 'traincourse', 'viewChapter'),
(7, 'traincourse', 'practice'),
(7, 'traincourse', 'practiceBrowse'),
(7, 'traincourse', 'practiceView'),
(7, 'traincourse', 'updatePractice'),
(7, 'trainplan', 'batchCreate'),
(7, 'trainplan', 'batchEdit'),
(7, 'trainplan', 'batchFinish'),
@@ -10562,6 +10608,12 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(8, 'trainchapter', 'sortChapterOrder'),
(8, 'trainchapter', 'view'),
(8, 'traincourse', 'browse'),
(8, 'traincourse', 'viewCourse'),
(8, 'traincourse', 'viewChapter'),
(8, 'traincourse', 'practice'),
(8, 'traincourse', 'practiceBrowse'),
(8, 'traincourse', 'practiceView'),
(8, 'traincourse', 'updatePractice'),
(8, 'traincourse', 'changeStatus'),
(8, 'traincourse', 'collect'),
(8, 'traincourse', 'create'),
@@ -11368,6 +11420,13 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(9, 'todo', 'import2Today'),
(9, 'todo', 'start'),
(9, 'todo', 'view'),
(9, 'traincourse', 'browse'),
(9, 'traincourse', 'viewCourse'),
(9, 'traincourse', 'viewChapter'),
(9, 'traincourse', 'practice'),
(9, 'traincourse', 'practiceBrowse'),
(9, 'traincourse', 'practiceView'),
(9, 'traincourse', 'updatePractice'),
(9, 'user', 'batchCreate'),
(9, 'user', 'batchEdit'),
(9, 'user', 'bug'),
@@ -11870,6 +11929,12 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(10, 'trainchapter', 'sortChapterOrder'),
(10, 'trainchapter', 'view'),
(10, 'traincourse', 'browse'),
(10, 'traincourse', 'viewCourse'),
(10, 'traincourse', 'viewChapter'),
(10, 'traincourse', 'practice'),
(10, 'traincourse', 'practiceBrowse'),
(10, 'traincourse', 'practiceView'),
(10, 'traincourse', 'updatePractice'),
(10, 'traincourse', 'create'),
(10, 'traincourse', 'delete'),
(10, 'traincourse', 'edit'),
@@ -12345,6 +12410,12 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(11, 'trainbook', 'returnbook'),
(11, 'trainbook', 'view'),
(11, 'traincourse', 'browse'),
(11, 'traincourse', 'viewCourse'),
(11, 'traincourse', 'viewChapter'),
(11, 'traincourse', 'practice'),
(11, 'traincourse', 'practiceBrowse'),
(11, 'traincourse', 'practiceView'),
(11, 'traincourse', 'updatePractice'),
(11, 'traincourse', 'changeStatus'),
(11, 'traincourse', 'create'),
(11, 'traincourse', 'edit'),
@@ -12387,6 +12458,13 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(11, 'workloadbudget', 'unlink'),
(11, 'workloadbudget', 'view'),
(12, 'my', 'limited'),
(13, 'traincourse', 'browse'),
(13, 'traincourse', 'viewCourse'),
(13, 'traincourse', 'viewChapter'),
(13, 'traincourse', 'practice'),
(13, 'traincourse', 'practiceBrowse'),
(13, 'traincourse', 'practiceView'),
(13, 'traincourse', 'updatePractice'),
(17, 'admin', 'index'),
(17, 'admin', 'register'),
(17, 'backup', 'backup'),
module/upgrade/config/upgradeflow.php
+1
View File
@@ -91,6 +91,7 @@ $config->upgrade->execFlow['18_5'] = array('functions' => 'installIPD,upd
$config->upgrade->execFlow['18_6'] = array('functions' => 'removeProductLineRequired');
$config->upgrade->execFlow['18_7'] = array('functions' => 'processHistoryDataForMetric,metric-updateMetricDate');
$config->upgrade->execFlow['18_8'] = array('functions' => 'upgradeTesttaskMembers,deleteGeneralReportBlock,stopOldCron');
$config->upgrade->execFlow['18_9'] = array('functions' => 'addDefaultTraincoursePriv');
if(!empty($config->isINT))
{
module/upgrade/css/afterexec.css
+4 -2
View File
@@ -4,8 +4,8 @@
.col-md-6 {width: 100% !important;}
.row .divider {display: block; width: 2px; height: 450px; background-color: rgba(0,0,0,.05); float: left;}
.row .col-md-6 .message {padding-top: 50px;}
.row .col-md-6 .message #tohome {margin-top: 50px;}
.row .col-md-6 .message {padding-top: 30px;}
.row .col-md-6 .message #tohome {margin-top: 50px; margin-bottom: 30px;}
.row .col-md-6 .message p {font-size: 16px;}
.row .col-md-6 .message .icon-check-circle {font-size: 85px; color: green;}
@@ -71,3 +71,5 @@
.card.ad > .card-reveal li {line-height: 1.5; font-size: 12px;}
.result-box {min-height: 400px; position: fixed; left: 50%; top: 50%; margin-left: -400px; margin-top: -200px;}
.priv-tips {color: #625E5E; padding: 0 100px; margin-bottom: 0; text-align: left;}
module/upgrade/lang/de.php
+2
View File
@@ -161,3 +161,5 @@ $lang->upgrade->remark = 'Remark';
$lang->upgrade->remarkDesc = 'You can also switch the mode in the Admin-System-Mode page of the system.';
$lang->upgrade->upgradingTip = 'The system is being upgraded, please wait patiently...';
$lang->upgrade->addTraincoursePrivTips = "In order to facilitate everyone's learning of project management-related knowledge, we have made the courses and practical repositories of the academy accessible to all permission groups by default. This ensures that everyone can easily access the resources. However, if you do not require this feature, you can disable it in the backend feature switch.";
module/upgrade/lang/en.php
+2
View File
@@ -161,3 +161,5 @@ $lang->upgrade->remark = 'Remark';
$lang->upgrade->remarkDesc = 'You can also switch the mode in the Admin-System-Mode page of the system.';
$lang->upgrade->upgradingTip = 'The system is being upgraded, please wait patiently...';
$lang->upgrade->addTraincoursePrivTips = "In order to facilitate everyone's learning of project management-related knowledge, we have made the courses and practical repositories of the academy accessible to all permission groups by default. This ensures that everyone can easily access the resources. However, if you do not require this feature, you can disable it in the backend feature switch.";
module/upgrade/lang/fr.php
+2
View File
@@ -161,3 +161,5 @@ $lang->upgrade->remark = 'Remark';
$lang->upgrade->remarkDesc = 'You can also switch the mode in the Admin-System-Mode page of the system.';
$lang->upgrade->upgradingTip = 'The system is being upgraded, please wait patiently...';
$lang->upgrade->addTraincoursePrivTips = "In order to facilitate everyone's learning of project management-related knowledge, we have made the courses and practical repositories of the academy accessible to all permission groups by default. This ensures that everyone can easily access the resources. However, if you do not require this feature, you can disable it in the backend feature switch.";
module/upgrade/lang/vi.php
+1
View File
@@ -120,3 +120,4 @@ $lang->upgrade->createProgramTip = 'At the same time, the system will automatic
$lang->upgrade->mergeManuallyTip = 'You can manually select the data merging method.';
include dirname(__FILE__) . '/version.php';
module/upgrade/lang/zh-cn.php
+2
View File
@@ -161,3 +161,5 @@ $lang->upgrade->remark = '备注';
$lang->upgrade->remarkDesc = '后续您还可以在禅道的后台-系统设置-模式中进行切换。';
$lang->upgrade->upgradingTip = '系统正在升级中，请耐心等待...';
$lang->upgrade->addTraincoursePrivTips = '为了帮助大家更好的学习项目管理相关知识，默认给所有权限分组分配了学堂的课程和实践库权限，便于大家都能访问。如果您不需要该功能，可以到后台功能开关中关闭该功能。';
module/upgrade/model.php
+22
View File
@@ -9181,4 +9181,26 @@ class upgradeModel extends model
{
touch($this->app->getCacheRoot() . 'restartcron');
}
/**
* Add default traincourse priv to each group.
*
* @access public
* @return bool
*/
public function addDefaultTraincoursePriv()
{
$this->saveLogs('Run Method ' . __FUNCTION__);
$groups = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->ne('limited')->andWhere('vision')->eq('rnd')->fetchPairs();
$sqlTemplate = 'REPLACE INTO ' . TABLE_GROUPPRIV . " (`group`, `module`, `method`) VALUES ('%s', 'traincourse', 'browse'), ('%s', 'traincourse', 'viewCourse'), ('%s', 'traincourse', 'viewChapter'), ('%s', 'traincourse', 'practice'), ('%s', 'traincourse', 'practiceBrowse'), ('%s', 'traincourse', 'practiceView'), ('%s', 'traincourse', 'updatePractice');";
foreach($groups as $groupID)
{
$sql = str_replace('%s', $groupID, $sqlTemplate);
$this->dbh->exec($sql);
}
return true;
}
}
module/upgrade/view/afterexec.html.php
+1
View File
@@ -20,6 +20,7 @@
<div class='col-md-6'>
<div class='message mgb-10 text-center'>
<strong><?php echo $lang->upgrade->success?></strong>
<p class="priv-tips"><?php echo $lang->upgrade->addTraincoursePrivTips;?></p>
<div><?php echo html::a('index.php', $lang->upgrade->tohome, '', "class='btn btn-primary btn-wide' id='tohome'")?></div>
</div>
</div>