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

Merge branch 'sprint/206_tianshujie_58288' into 'master'

Browse Source 
Sprint/206 tianshujie 58288

See merge request easycorp/zentaopms!4109
This commit is contained in:
王怡栋
2022-06-23 07:08:36 +00:00
parent a6ec47142f 64505acdf3
commit f23d4b8abd
8 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+2 -12
View File
@@ -345,12 +345,7 @@ class executionModel extends model
if(isset($_POST['heightType']) and $this->post->heightType == 'custom')
{
if(!preg_match("/^-?\d+$/", $sprint->displayCards) or $sprint->displayCards < 3)
{
$this->app->loadLang('kanban');
dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
return false;
}
if(!$this->loadModel('kanban')->checkDisplayCards($sprint->displayCards)) return;
}
/* Check the workload format and total. */
@@ -500,12 +495,7 @@ class executionModel extends model
if(isset($_POST['heightType']) and $this->post->heightType == 'custom')
{
if(!preg_match("/^-?\d+$/", $execution->displayCards) or $execution->displayCards < 3)
{
$this->app->loadLang('kanban');
dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
return false;
}
if(!$this->loadModel('kanban')->checkDisplayCards($execution->displayCards)) return;
}
if(in_array($execution->status, array('closed', 'suspended'))) $this->computeBurn($executionID);