diff --git a/ci.json b/ci.json
index a0f731b9bb..ccaddd050e 100644
--- a/ci.json
+++ b/ci.json
@@ -5,7 +5,7 @@
"version": "8.0"
},
"zentaoext": {
- "gitVersion": "release-18.10",
+ "gitVersion": "release-ipd1.2",
"gitRepo": "easycorp/zentaoext"
},
"zdoo": {
@@ -15,7 +15,7 @@
"gitVersion": "master"
},
"downgrade": {
- "gitVersion": "release-18.10",
+ "gitVersion": "release-ipd1.2",
"gitRepo": "devops/zentaopms-downgrade"
}
},
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ecd7593942..c6d00b9262 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -28,6 +28,8 @@ IPD版：
51992 需求池需求提交、需求详情和编辑页面中将所属产品字段调整为分发产品
51995 需求池没有绑定产品时需求可以分发到多个产品
51997 需求池绑定产品后需求可以分发到绑定产品中
+52658 需求编辑页面中实现解除与已分发产品的关联关系
+52111 撤回的用户需求影响到其他对象时，其他对象增加确认操作
修复的Bug
43006 调研的阶段列表下搜索报错
43126 复制需求池需求时选择父需求，保存报错
diff --git a/misc/ci/Jenkinsfile b/misc/ci/Jenkinsfile
index 70f6c1356f..ab9eb52690 100644
--- a/misc/ci/Jenkinsfile
+++ b/misc/ci/Jenkinsfile
@@ -443,7 +443,7 @@ pipeline {
steps {
script {
buildZboxLinux.doBuild()
- buildZboxLinux.test()
+ //buildZboxLinux.test()
buildZboxLinux.uploadInternal()
}
}
@@ -524,20 +524,20 @@ pipeline {
sh "make markdown-init"
}
stage("docker build") {
- sh 'make test-open'
- sh 'make build'
+ //sh 'make test-open'
+ //sh 'make build'
- sh 'make test-biz'
- sh 'make build-biz'
+ //sh 'make test-biz'
+ //sh 'make build-biz'
- sh 'make test-biz-k8s'
- sh 'make build-biz-k8s'
+ //sh 'make test-biz-k8s'
+ //sh 'make build-biz-k8s'
- sh 'make test-max'
- sh 'make build-max'
+ //sh 'make test-max'
+ //sh 'make build-max'
- sh 'make test-max-k8s'
- sh 'make build-max-k8s'
+ //sh 'make test-max-k8s'
+ //sh 'make build-max-k8s'
sh 'make test-ipd'
sh 'make build-ipd'
diff --git a/module/bug/control.php b/module/bug/control.php
index 9efa33eed8..6fb228090f 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -227,6 +227,7 @@ class bug extends control
$branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
}
}
+ if($this->config->edition == 'ipd') $bugs = $this->loadModel('story')->getAffectObject($bugs, 'bug');
/* Set view. */
$this->view->title = $productName . $this->lang->colon . $this->lang->bug->common;
@@ -935,6 +936,7 @@ class bug extends control
$this->session->set("project", key($projects), 'project');
$this->executeHooks($bugID);
+ if($this->config->edition == 'ipd') $bug = $this->loadModel('story')->getAffectObject('', 'bug', $bug);
/* Header and positon. */
$this->view->title = "BUG #$bug->id $bug->title - " . $product->name;
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 6dc06db362..1af47ebf39 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -566,6 +566,9 @@ $lang->noticePasteImg = "Paste images here";
$lang->pasteImgFail = "Failed to paste images. Try again later.";
$lang->pasteImgUploading = "Uploading...";
+$lang->visionTips = "You can switch vision here";
+$lang->IKnow = "I know";
+
/* Time formats settings. */
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 6ff0bab64a..65dc9b5d4f 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -566,6 +566,9 @@ $lang->noticePasteImg = "You can paste images into the editor.";
$lang->pasteImgFail = "Failed to paste images. Try again later.";
$lang->pasteImgUploading = "Uploading...";
+$lang->visionTips = "You can switch vision here";
+$lang->IKnow = "I know";
+
/* Time formats settings. */
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 8da3d334c7..32b55b21a1 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -566,6 +566,9 @@ $lang->noticePasteImg = "Vous pouvez déposer des images dans l'éditeur.";
$lang->pasteImgFail = "Echec lors de la dépose des images. Essayez plus tard.";
$lang->pasteImgUploading = "Chargement...";
+$lang->visionTips = "You can switch vision here";
+$lang->IKnow = "I know";
+
/* Time formats settings. */
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 8178e2c35d..c256e2d2a3 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -566,6 +566,9 @@ $lang->noticePasteImg = "可以在编辑器直接贴图。";
$lang->pasteImgFail = "贴图失败，请稍后重试。";
$lang->pasteImgUploading = "正在上传图片，请稍后...";
+$lang->visionTips = "您可以在这里切换界面";
+$lang->IKnow = "我知道了";
+
/* 时间格式设置。*/
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
diff --git a/module/common/model.php b/module/common/model.php
index c272d195e5..d2c8fb3203 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2660,6 +2660,7 @@ EOF;
if($module == 'story' and $method == 'linkrequirements') $module = 'requirement';
if($module == 'requirement' and $method == 'processstorychange') $module = 'story';
if($app->config->vision != 'lite' and $module == 'feedback' and $method == 'view') $method = 'adminview';
+ if($method == 'confirmdemandretract' and $module == 'requirement') $module = 'story';
/* If the user is doing a tutorial, have all tutorial privs. */
if(defined('TUTORIAL'))
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index caa2c93e2c..a30c8366f0 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -8,6 +8,13 @@ include 'chosen.html.php';
app->loadConfig('sso');?>
sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
showMainMenu):?>
+