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

[sync story #73341] Sync code to this branch from feature/deliverable.

Browse Source
This commit is contained in:
wangyidong
2025-05-12 10:42:45 +08:00
committed by 刘刚
parent 0405a6469f
commit aa4bd17b2b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/packagemanager.php
+4 -2
View File
@@ -2114,8 +2114,10 @@ $config->group->package->programPlan = new stdclass();
$config->group->package->programPlan->order = 5;
$config->group->package->programPlan->subset = 'programplan';
$config->group->package->programPlan->privs = array();
$config->group->package->programPlan->privs['programplan-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-edit'));
$config->group->package->programPlan->privs['programplan-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-create'));
$config->group->package->programPlan->privs['programplan-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-edit'));
$config->group->package->programPlan->privs['programplan-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-create'));
$config->group->package->programPlan->privs['programplan-exportTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('programplan-browse', 'project-execution'), 'recommend' => array());
$config->group->package->programPlan->privs['programplan-import'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('programplan-browse', 'project-execution'), 'recommend' => array());
$config->group->package->browseDesign = new stdclass();
$config->group->package->browseDesign->order = 5;
module/transfer/tao.php
+7 -5
View File
@@ -117,6 +117,12 @@ class transferTao extends transferModel
$linkFieldName = $linkField . 'List';
$tmpFieldName = array();
if(isset($_POST['cascade'][$field]))
{
$lists[$fieldName] = $_POST['cascade'][$field];
continue;
}
if(empty($lists[$fieldName]) || empty($lists[$linkFieldName])) continue;
/* 根据字段名获取表名。*/
@@ -133,11 +139,7 @@ class transferTao extends transferModel
/* 将获取到的数据替换到lists中。*/
/* Replace data to lists. */
foreach($fieldDatas as $id => $linkFieldID)
{
$tmpFieldName[$linkFieldID][$id] = $lists[$fieldName][$id];
}
foreach($fieldDatas as $id => $linkFieldID) $tmpFieldName[$linkFieldID][$id] = $lists[$fieldName][$id];
$lists[$fieldName] = $tmpFieldName;
}