+ story->legendChildStories;?>
id $case->title - " . $libraries[$case->lib];
$position[] = html::a($this->createLink('testsuite', 'library', "libID=$case->lib"), $libraries[$case->lib]);
- $this->view->libID = $case->lib;
- $this->view->libName = $libraries[$case->lib];
- $this->view->libraries = $libraries;
+ $this->view->libID = $case->lib;
+ $this->view->libName = $libraries[$case->lib];
+ $this->view->libraries = $libraries;
+ $this->view->linkedCaseID = $this->testcase->getLinkedCaseID($case->lib, $caseID);
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($case->lib, $viewType = 'caselib', $startModuleID = 0);
}
else
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index a89a21d2e9..d3d069d399 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -139,6 +139,7 @@ $lang->testcase->confirmDelete = 'Do you want to delete this Test Case?';
$lang->testcase->confirmBatchDelete = 'Do you want to batch delete these Test Cases?';
$lang->testcase->ditto = 'Ditto';
$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the previous one!';
+$lang->testcase->haveLinkCase = 'It has linked case, update this one, the linked case will change.';
$lang->testcase->reviewList[0] = 'NO';
$lang->testcase->reviewList[1] = 'YES';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 8983c59994..faef133b49 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -139,6 +139,7 @@ $lang->testcase->confirmDelete = '您确认要删除该测试用例吗？';
$lang->testcase->confirmBatchDelete = '您确认要批量删除这些测试用例吗？';
$lang->testcase->ditto = '同上';
$lang->testcase->dittoNotice = '该用例与上一用例不属于同一产品！';
+$lang->testcase->haveLinkCase = '此用例存在相关用例，更新后，其相关用例会一并更新。';
$lang->testcase->reviewList[0] = '否';
$lang->testcase->reviewList[1] = '是';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 382b597292..e9b095e2ec 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -604,6 +604,24 @@ class testcaseModel extends model
return $caseCounts;
}
+ /**
+ * Check have linked cases or not.
+ *
+ * @param int $libID
+ * @param int $caseID$
+ * @access public
+ * @return int
+ */
+ public function getLinkedCaseID($libID, $caseID)
+ {
+ $linkedCaseID = $this->dao->select('id')->from(TABLE_CASE)
+ ->where('lib')->eq($libID)
+ ->andWhere('fromCaseID')->eq($caseID)
+ ->andWhere('deleted')->eq(0)
+ ->fetch('id');
+ return $linkedCaseID;
+ }
+
/**
* Update a case.
*
@@ -613,7 +631,10 @@ class testcaseModel extends model
*/
public function update($caseID)
{
- $oldCase = $this->getById($caseID);
+ $oldCase = $this->getById($caseID);
+ $isLibCase = ($oldCase->lib and empty($oldCase->product));
+ $linkedCases = '';
+ if($isLibCase) $linkedCases = $this->dao->select('id')->from(TABLE_CASE)->where('fromCaseID')->eq($caseID)->fetchPairs();
if(!empty($_POST['lastEditedDate']) and $oldCase->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->editedByOther;
@@ -666,6 +687,10 @@ class testcaseModel extends model
->get();
if(!$this->forceNotReview() and $stepChanged) $case->status = 'wait';
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->edit->requiredFields, 'notempty')->where('id')->eq((int)$caseID)->exec();
+ if($isLibCase and $linkedCases)
+ {
+ foreach($linkedCases as $linkedCaseID) $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->edit->requiredFields, 'notempty')->where('id')->eq((int)$linkedCaseID)->exec();
+ }
if(!$this->dao->isError())
{
if($stepChanged)
@@ -685,6 +710,15 @@ class testcaseModel extends model
$this->dao->insert(TABLE_CASESTEP)->data($step)->autoCheck()->exec();
if($step->type == 'group') $parentStepID = $this->dao->lastInsertID();
if($step->type == 'step') $parentStepID = 0;
+
+ if($isLibCase and $linkedCases)
+ {
+ foreach($linkedCases as $linkedCaseID)
+ {
+ $step->case = $linkedCaseID;
+ $this->dao->insert(TABLE_CASESTEP)->data($step)->autoCheck()->exec();
+ }
+ }
}
}
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 16478f6e1e..5a561e7418 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -125,6 +125,7 @@
lastEditedDate);?>
testtask->build;?>
-
+
+
+
+ build->create, '', "data-toggle='modal' data-type='iframe' data-width='95%'")?>
+
+ refresh, '', "class='refresh' onclick='loadProjectBuilds($projectID)'");?>
+
+
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index b391ea4b6a..f258d53621 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -9,17 +9,17 @@
* @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
-$lang->upgrade->common = 'Upgrade';
+$lang->upgrade->common = 'Update';
$lang->upgrade->result = 'Result';
$lang->upgrade->fail = 'Failed';
-$lang->upgrade->success = 'Upgraded';
+$lang->upgrade->success = 'Updated';
$lang->upgrade->tohome = 'Visit ZenTao';
$lang->upgrade->license = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2.';
$lang->upgrade->warnning= 'Warning!';
$lang->upgrade->checkExtension = 'Check Extension';
$lang->upgrade->consistency = 'Check Consistency';
$lang->upgrade->warnningContent = <<Please backup your database before upgrading ZenTao!
+Please backup your database before updating ZenTao!
1. Use phpMyAdmin to backup.
2. Use mysqlCommand to backup.
@@ -36,11 +36,11 @@ $lang->upgrade->setStatusFile = 'Please finish the following actionsOr delete "%s " and create ok.txt and leave it blank.
I have read and done as instructed above. Continue upgrading.
';
-$lang->upgrade->selectVersion = 'Select Version';
+$lang->upgrade->selectVersion = 'Version';
$lang->upgrade->continue = 'Continue';
$lang->upgrade->noteVersion = "Select the compatible version, or it might cause data loss.";
$lang->upgrade->fromVersion = 'From';
-$lang->upgrade->toVersion = 'Upgrade to';
+$lang->upgrade->toVersion = 'To';
$lang->upgrade->confirm = 'Confirm SQL';
$lang->upgrade->sureExecute = 'Execute';
$lang->upgrade->forbiddenExt = 'Extension is not compatible with the version. It has been deactivated:';