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

* fix add comment for story/task/bug/case.

Browse Source
This commit is contained in:
wangyidong
2016-03-18 08:23:34 +08:00
parent 9687085189
commit 589d4988a4
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+1 -1
View File
@@ -430,7 +430,7 @@ class bugModel extends model
public function update($bugID)
{
$oldBug = $this->getById($bugID);
if($oldBug->lastEditedDate != $this->post->lastEditedDate)
if(isset($_POST['lastEditedDate']) and $oldBug->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->editedByOther;
return false;
module/story/model.php
+2 -2
View File
@@ -342,7 +342,7 @@ class storyModel extends model
{
$specChanged = false;
$oldStory = $this->getById($storyID);
if($oldStory->lastEditedDate != $this->post->lastEditedDate)
if(isset($_POST['lastEditedDate']) and $oldStory->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->editedByOther;
return false;
@@ -405,7 +405,7 @@ class storyModel extends model
{
$now = helper::now();
$oldStory = $this->getById($storyID);
if($oldStory->lastEditedDate != $this->post->lastEditedDate)
if(isset($_POST['lastEditedDate']) and $oldStory->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->editedByOther;
return false;
module/task/model.php
+1 -1
View File
@@ -187,7 +187,7 @@ class taskModel extends model
public function update($taskID)
{
$oldTask = $this->getById($taskID);
if($oldTask->lastEditedDate != $this->post->lastEditedDate)
if(isset($_POST['lastEditedDate']) and $oldTask->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->editedByOther;
return false;
module/testcase/model.php
+1 -1
View File
@@ -358,7 +358,7 @@ class testcaseModel extends model
public function update($caseID)
{
$oldCase = $this->getById($caseID);
if($oldCase->lastEditedDate != $this->post->lastEditedDate)
if(isset($_POST['lastEditedDate']) and $oldCase->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->editedByOther;
return false;
module/upgrade/control.php
+1
View File
@@ -110,6 +110,7 @@ class upgrade extends control
$this->view->errors = $this->upgrade->getError();
}
$this->display();
if($this->view->result == 'fail') die();
@unlink($this->app->getAppRoot() . 'www/install.php');
@unlink($this->app->getAppRoot() . 'www/upgrade.php');
module/upgrade/model.php
+1
View File
@@ -203,6 +203,7 @@ class upgradeModel extends model
case '7_1': $confirmContent .= file_get_contents($this->getUpgradeFile('7.1'));
case '7_2':
case '7_2_4': $confirmContent .= file_get_contents($this->getUpgradeFile('7.2.4'));
case '7_2_5':
case '7_3': $confirmContent .= file_get_contents($this->getUpgradeFile('7.3'));
case '7_4_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('7.4.beta'));
case '8_0':