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

Merge branch 'pailei2_mayue_bug#20808' into 'pailei2'

Browse Source 
* Fix bug #20808.

See merge request easycorp/zentaopms!2403
This commit is contained in:
李玉春
2022-03-21 08:44:09 +00:00
parent c8c25d957f 8f09a4957c
commit 0e4e9594c7
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/productplan/control.php
View File

@@ -444,14 +444,14 @@ class productplan extends control
{
if($confirm == 'no')
{
die(js::confirm($this->lang->productplan->confirmStart, $this->createLink('productplan', 'start', "planID=$planID&confirm=yes"), 'parent'));
return print(js::confirm($this->lang->productplan->confirmStart, $this->createLink('productplan', 'start', "planID=$planID&confirm=yes")));
}
else
{
$this->productplan->updateStatus($planID, 'doing', 'started');
if(dao::isError()) die(js::error(dao::getError()));
die(js::reload('parent'));
if(dao::isError()) return print(js::error(dao::getError()));
return print(js::reload('parent'));
}
}
@@ -467,14 +467,14 @@ class productplan extends control
{
if($confirm == 'no')
{
die(js::confirm($this->lang->productplan->confirmFinish, $this->createLink('productplan', 'finish', "planID=$planID&confirm=yes"), 'parent'));
return print(js::confirm($this->lang->productplan->confirmFinish, $this->createLink('productplan', 'finish', "planID=$planID&confirm=yes")));
}
else
{
$this->productplan->updateStatus($planID, 'done', 'finished');
if(dao::isError()) die(js::error(dao::getError()));
die(js::reload('parent'));
if(dao::isError()) return print(js::error(dao::getError()));
return print(js::reload('parent'));
}
}

15
module/productplan/view/view.html.php
View File

@@ -45,17 +45,10 @@
if($plan->parent >= 0)
{
$attr = "target='hiddenwin'";
$isOnlyBody = false;
$class = '';
if($plan->begin == $config->productplan->future or $plan->end == $config->productplan->future)
{
$class = 'iframe';
$attr = "data-toggle='modal' data-id='{$plan->id}' data-width='550px'";
$isOnlyBody = true;
}
$class = $plan->status == 'wait' ? $class : 'disabled';
common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', $isOnlyBody, $plan);
$attr = "target='hiddenwin'";
$class = $plan->status == 'wait' ? '' : 'disabled';
common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', false, $plan);
$class = $plan->status == 'doing' ? '' : 'disabled';
common::printLink('productplan', 'finish', "planID=$plan->id", "<i class='icon-checked'></i>{$lang->productplan->finishAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->finish}'", '', false, $plan);
$class = $plan->status !== 'closed' ? 'iframe' : 'disabled';