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

* Fix merge zentaoipd code error.

Browse Source
This commit is contained in:
tanghucheng
2023-08-01 09:33:07 +08:00
parent 566057d415
commit 10acc6b909
7 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/updateipdinstall.sql
-5
View File
@@ -168,11 +168,6 @@ ALTER TABLE `zt_charter` ADD `activatedDate` datetime NULL;
UPDATE `zt_priv` SET `vision` = ',rnd,or,' WHERE `module` = 'requirement' AND `method` = 'import';
UPDATE `zt_priv` SET `vision` = ',rnd,or,' WHERE `module` = 'requirement' AND `method` = 'exportTemplate';
REPLACE INTO `zt_config` (`vision`, `owner`, `module`, `section`, `key`, `value`) VALUES ('', 'system', 'common', 'global', 'mode', 'PLM');
REPLACE INTO `zt_config` (`vision`, `owner`, `module`, `section`, `key`, `value`) VALUES ('', 'system', 'custom', '', 'URAndSR', '1');
REPLACE INTO `zt_config` (`vision`, `owner`, `module`, `section`, `key`, `value`) VALUES ('', 'system', 'common', '', 'disabledFeatures', '');
REPLACE INTO `zt_config` (`vision`, `owner`, `module`, `section`, `key`, `value`) VALUES ('', 'system', 'common', '', 'closedFeatures', '');
REPLACE INTO `zt_priv` (`module`, `method`, `parent`, `edition`, `vision`, `system`, `order`) VALUES ('demand', 'export', '643', ',ipd,', ',or,', '1', '210');
REPLACE INTO `zt_privlang` (`objectID`, `objectType`, `lang`, `key`, `value`, `desc`) VALUES (2109, 'priv', 'de', 'demand-export', '', '');
REPLACE INTO `zt_privlang` (`objectID`, `objectType`, `lang`, `key`, `value`, `desc`) VALUES (2109, 'priv', 'en', 'demand-export', '', '');
module/common/lang/de.php
+7 -2
View File
@@ -409,10 +409,15 @@ $lang->exportTypeList['all'] = 'Alle';
$lang->exportTypeList['selected'] = 'Ausgewählte';
$lang->visionList = array();
$lang->visionList['or'] = 'OR & MM Interface';
$lang->visionList['rnd'] = 'IPD Interface';
$lang->visionList['rnd'] = 'Full Feature Interface';
$lang->visionList['lite'] = 'Operation Management Interface';
if($config->edition == 'ipd')
{
$lang->visionList['or'] = 'OR & MM Interface';
$lang->visionList['rnd'] = 'IPD Interface';
}
$lang->createObjects['todo'] = 'Todo';
$lang->createObjects['effort'] = 'Effort';
$lang->createObjects['bug'] = 'Bug';
module/common/lang/en.php
+7 -2
View File
@@ -409,10 +409,15 @@ $lang->exportTypeList['all'] = 'All Data';
$lang->exportTypeList['selected'] = 'Selected Data';
$lang->visionList = array();
$lang->visionList['or'] = 'OR & MM Interface';
$lang->visionList['rnd'] = 'IPD Interface';
$lang->visionList['rnd'] = 'Full Feature Interface';
$lang->visionList['lite'] = 'Operation Management Interface';
if($config->edition == 'ipd')
{
$lang->visionList['or'] = 'OR & MM Interface';
$lang->visionList['rnd'] = 'IPD Interface';
}
$lang->createObjects['todo'] = 'Todo';
$lang->createObjects['effort'] = 'Effort';
$lang->createObjects['bug'] = 'Bug';
module/common/lang/fr.php
+7 -2
View File
@@ -409,10 +409,15 @@ $lang->exportTypeList['all'] = 'Toutes les Données';
$lang->exportTypeList['selected'] = 'Données sélectionnées';
$lang->visionList = array();
$lang->visionList['or'] = 'OR & MM Interface';
$lang->visionList['rnd'] = 'IPD Interface';
$lang->visionList['rnd'] = 'Full Feature Interface';
$lang->visionList['lite'] = 'Operation Management Interface';
if($config->edition == 'ipd')
{
$lang->visionList['or'] = 'OR & MM Interface';
$lang->visionList['rnd'] = 'IPD Interface';
}
$lang->createObjects['todo'] = 'Todo';
$lang->createObjects['effort'] = 'Effort';
$lang->createObjects['bug'] = 'Bug';
module/common/lang/zh-cn.php
+7 -2
View File
@@ -409,10 +409,15 @@ $lang->exportTypeList['all'] = '全部记录';
$lang->exportTypeList['selected'] = '选中记录';
$lang->visionList = array();
$lang->visionList['or'] = '需求与市场管理界面';
$lang->visionList['rnd'] = 'IPD研发管理界面';
$lang->visionList['rnd'] = '综合研发界面';
$lang->visionList['lite'] = '运营管理界面';
if($config->edition == 'ipd')
{
$lang->visionList['or'] = '需求与市场管理界面';
$lang->visionList['rnd'] = 'IPD研发管理界面';
}
$lang->createObjects['todo'] = '待办';
$lang->createObjects['effort'] = '日志';
$lang->createObjects['bug'] = 'Bug';
module/my/model.php
+1 -1
View File
@@ -1055,7 +1055,7 @@ class myModel extends model
public function getReviewingList($browseType, $orderBy = 'time_desc', $pager = null)
{
$reviewList = array();
if($browseType == 'all' or $browseType == 'demand') $reviewList = array_merge($reviewList, $this->getReviewingDemands());
if($this->config->edition == 'ipd' and ($browseType == 'all' or $browseType == 'demand')) $reviewList = array_merge($reviewList, $this->getReviewingDemands());
if($browseType == 'all' or $browseType == 'story') $reviewList = array_merge($reviewList, $this->getReviewingStories());
if($browseType == 'all' or $browseType == 'testcase') $reviewList = array_merge($reviewList, $this->getReviewingCases());
if($browseType == 'all' or $browseType == 'project') $reviewList = array_merge($reviewList, $this->getReviewingApprovals());
module/upgrade/control.php
+8
View File
@@ -216,6 +216,14 @@ class upgrade extends control
$this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
}
if($this->config->edition == 'ipd' and strpos($fromVersion, 'ipd') === false)
{
$this->loadModel('setting')->setItem('system.common.global.mode', 'PLM');
$this->loadModel('setting')->setItem('system.custom.URAndSR', '1');
$this->loadModel('setting')->setItem('system.common.closedFeatures', '');
$this->loadModel('setting')->setItem('system.common.disabledFeatures', '');
}
$this->view->result = 'sqlFail';
$this->view->errors = $this->upgrade->getError();
$this->display();