From 4e0de461e68bb984cfdad69d721c10c4825d2f54 Mon Sep 17 00:00:00 2001 From: chaideqing Date: Wed, 11 Oct 2023 05:53:04 +0000 Subject: [PATCH] * Fix bug#39367. --- module/group/packagemanager.php | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index ead2ba223c..9a1919eebe 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -3967,7 +3967,7 @@ $config->group->package->trainPracticeLib->privs['traincourse-updatePractice'] = $config->group->package->browseMarket = new stdclass(); $config->group->package->browseMarket->subset = 'market'; $config->group->package->browseMarket->privs = array(); -$config->group->package->browseMarket->privs['market-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(''), 'recommend' => array('market-view')); +$config->group->package->browseMarket->privs['market-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(), 'recommend' => array('market-view')); $config->group->package->browseMarket->privs['market-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('market-browse'), 'recommend' => array()); $config->group->package->manageMarket = new stdclass(); @@ -3989,8 +3989,8 @@ $config->group->package->deleteMarket->privs['market-delete'] = array('edition' $config->group->package->browseReport = new stdclass(); $config->group->package->browseReport->subset = 'marketreport'; $config->group->package->browseReport->privs = array(); -$config->group->package->browseReport->privs['marketreport-all'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(''), 'recommend' => array('market-view')); -$config->group->package->browseReport->privs['marketreport-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array(''), 'recommend' => array('market-view')); +$config->group->package->browseReport->privs['marketreport-all'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(), 'recommend' => array('market-view')); +$config->group->package->browseReport->privs['marketreport-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array(), 'recommend' => array('market-view')); $config->group->package->browseReport->privs['marketreport-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketreport-browse'), 'recommend' => array()); $config->group->package->manageReport = new stdclass(); @@ -3998,7 +3998,7 @@ $config->group->package->manageReport->subset = 'marketreport'; $config->group->package->manageReport->privs = array(); $config->group->package->manageReport->privs['marketreport-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketreport-all', 'marketreport-browse', 'marketreport-publish'), 'recommend' => array('marketreport-view')); $config->group->package->manageReport->privs['marketreport-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketreport-all', 'marketreport-browse', 'marketreport-publish'), 'recommend' => array('marketreport-view')); -$config->group->package->manageReport->privs['marketreport-publish'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketreport-all', 'marketreport-browse', 'marketreport-create', 'marketreport-edit'), 'recommend' => array('marketreport-view')); +$config->group->package->manageReport->privs['marketreport-publish'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketreport-all', 'marketreport-browse'), 'recommend' => array('marketreport-view')); $config->group->package->deleteReport = new stdclass(); $config->group->package->deleteReport->subset = 'marketreport'; @@ -4008,30 +4008,30 @@ $config->group->package->deleteReport->privs['marketreport-delete'] = array('edi $config->group->package->browseResearch = new stdclass(); $config->group->package->browseResearch->subset = 'marketresearch'; $config->group->package->browseResearch->privs = array(); -$config->group->package->browseResearch->privs['marketresearch-all'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(''), 'recommend' => array('marketresearch-view')); -$config->group->package->browseResearch->privs['marketresearch-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array(''), 'recommend' => array('marketresearch-view')); -$config->group->package->browseResearch->privs['marketresearch-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array(''), 'recommend' => array('marketresearch-all', 'marketresearch-browse')); +$config->group->package->browseResearch->privs['marketresearch-all'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(), 'recommend' => array('marketresearch-view')); +$config->group->package->browseResearch->privs['marketresearch-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array(), 'recommend' => array('marketresearch-view')); +$config->group->package->browseResearch->privs['marketresearch-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array(), 'recommend' => array('marketresearch-all', 'marketresearch-browse')); $config->group->package->manageResearch = new stdclass(); $config->group->package->manageResearch->subset = 'marketresearch'; $config->group->package->manageResearch->privs = array(); -$config->group->package->manageResearch->privs['marketresearch-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); -$config->group->package->manageResearch->privs['marketresearch-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array('')); -$config->group->package->manageResearch->privs['marketresearch-activate'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array('')); -$config->group->package->manageResearch->privs['marketresearch-start'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array('')); -$config->group->package->manageResearch->privs['marketresearch-close'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array('')); +$config->group->package->manageResearch->privs['marketresearch-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); +$config->group->package->manageResearch->privs['marketresearch-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array()); +$config->group->package->manageResearch->privs['marketresearch-activate'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array()); +$config->group->package->manageResearch->privs['marketresearch-start'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array()); +$config->group->package->manageResearch->privs['marketresearch-close'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array()); $config->group->package->researchTeam = new stdclass(); $config->group->package->researchTeam->subset = 'marketresearch'; $config->group->package->researchTeam->privs = array(); -$config->group->package->researchTeam->privs['marketresearch-manageMembers'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array('')); -$config->group->package->researchTeam->privs['marketresearch-unlinkMember'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view', 'marketresearch-manageMembers'), 'recommend' => array('')); +$config->group->package->researchTeam->privs['marketresearch-manageMembers'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array()); +$config->group->package->researchTeam->privs['marketresearch-unlinkMember'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view', 'marketresearch-manageMembers'), 'recommend' => array()); $config->group->package->researchTeam->privs['marketresearch-team'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array('marketresearch-view')); $config->group->package->marketResearchReport = new stdclass(); $config->group->package->marketResearchReport->subset = 'marketresearch'; $config->group->package->marketResearchReport->privs = array(); -$config->group->package->marketResearchReport->privs['marketresearch-reports'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketreport-browse', 'marketreport-create', 'marketreport-all', 'marketresearch-browse', 'marketreport-view'), 'recommend' => array('')); +$config->group->package->marketResearchReport->privs['marketresearch-reports'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketreport-browse', 'marketreport-create', 'marketreport-all', 'marketresearch-browse', 'marketreport-view'), 'recommend' => array()); $config->group->package->deleteResearch = new stdclass(); $config->group->package->deleteResearch->subset = 'marketresearch'; @@ -4047,22 +4047,22 @@ $config->group->package->manageResearchStage = new stdclass(); $config->group->package->manageResearchStage->subset = 'researchstage'; $config->group->package->manageResearchStage->privs = array(); $config->group->package->manageResearchStage->privs['marketresearch-createStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('marketresearch-view')); -$config->group->package->manageResearchStage->privs['marketresearch-editStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); -$config->group->package->manageResearchStage->privs['marketresearch-batchStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); -$config->group->package->manageResearchStage->privs['marketresearch-startStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); -$config->group->package->manageResearchStage->privs['marketresearch-closeStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); -$config->group->package->manageResearchStage->privs['marketresearch-activateStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 30, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); +$config->group->package->manageResearchStage->privs['marketresearch-editStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); +$config->group->package->manageResearchStage->privs['marketresearch-batchStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); +$config->group->package->manageResearchStage->privs['marketresearch-startStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); +$config->group->package->manageResearchStage->privs['marketresearch-closeStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); +$config->group->package->manageResearchStage->privs['marketresearch-activateStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 30, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); $config->group->package->deleteResearchStage = new stdclass(); $config->group->package->deleteResearchStage->subset = 'researchstage'; $config->group->package->deleteResearchStage->privs = array(); -$config->group->package->deleteResearchStage->privs['marketresearch-deleteStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); +$config->group->package->deleteResearchStage->privs['marketresearch-deleteStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); $config->group->package->browseResearchTask = new stdclass(); $config->group->package->browseResearchTask->subset = 'researchtask'; $config->group->package->browseResearchTask->privs = array(); $config->group->package->browseResearchTask->privs['marketresearch-stage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array('marketresearch-viewTask')); -$config->group->package->browseResearchTask->privs['marketresearch-viewTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('')); +$config->group->package->browseResearchTask->privs['marketresearch-viewTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array()); $config->group->package->manageResearchTask = new stdclass(); $config->group->package->manageResearchTask->subset = 'researchtask';