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

* Fix bug.

Browse Source
This commit is contained in:
leiyong
2020-11-03 13:31:01 +08:00
parent db06f613cd
commit f817727ef1
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+1 -1
View File
@@ -1547,7 +1547,7 @@ class docModel extends model
{
$libID = key($libs);
$html .= "<div class='dropdown' id='createDropdown'>";
$html .= "<button class='btn btn-primary color-darkblue' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->create . " <span class='caret'></span></button>";
$html .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->create . " <span class='caret'></span></button>";
$html .= "<ul class='dropdown-menu' style='left:0px'>";
foreach($this->lang->doc->typeList as $typeKey => $typeName)
{
module/program/control.php
+3 -9
View File
@@ -851,9 +851,6 @@ class program extends control
$changes = $this->program->PRJUpdate($projectID);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->processErrors(dao::getError())));
$this->project->updateProducts($projectID);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->processErrors(dao::getError())));
if($changes)
{
$actionID = $this->loadModel('action')->create('project', $projectID, 'edited');
@@ -864,16 +861,13 @@ class program extends control
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $url));
}
$project = $this->program->getPRJByID($projectID);
$parents = $this->program->getParentPairs();
$programID = $this->program->getPRJProgramID($projectID);
$project = $this->program->getPRJByID($projectID);
$parents = $this->program->getParentPairs();
$linkedProducts = array();
$linkedBranches = array();
$productPlans = array(0 => '');
$allProducts = $parentID ? $this->program->getPGMProduct($parentID) : $this->program->getPGMProduct($projectID);
$linkedProducts = $this->project->getProducts($projectID);
$linkedProducts = $parentID ? array() : $this->project->getProducts($projectID);
foreach($linkedProducts as $product)
{
module/story/control.php
+4
View File
@@ -892,6 +892,10 @@ class story extends control
*/
public function review($storyID)
{
$this->loadModel('product');
$this->lang->product->menu = $this->lang->product->viewMenu;
$this->lang->product->switcherMenu = $this->product->getSwitcher($this->session->product);
if(!empty($_POST))
{
$changes = $this->story->review($storyID);