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

Merge branch 'zentaopms_256' into 'sprint/zentaopms268_mayue_bug#30422'

Browse Source 
# Conflicts:
#   module/productplan/control.php
This commit is contained in:
孙广明
2022-12-01 06:47:48 +00:00
parent c866a1ab41 1caccc3696
commit 287800ee73
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -1048,7 +1048,7 @@ class product extends control
$multiple = strpos($param, 'multiple') === false ? '' : 'multiple';
$output = html::select($field, $plans, $planID, "class='form-control chosen' $multiple");
if($branch == 0 and strpos($param, 'edit') and !strpos($param, 'forstory')) $output = html::select($field, $plans, $planID, "class='form-control chosen' multiple");
if($branch == 0 and strpos($param, 'edit') and (strpos($param, 'forstory') === false)) $output = html::select($field, $plans, $planID, "class='form-control chosen' multiple");
if(count($plans) == 1 and $needCreate and $needCreate !== 'false')
{
module/story/control.php
+1 -2
View File
@@ -440,8 +440,7 @@ class story extends control
$this->view->users = $users;
$this->view->moduleID = $moduleID;
$this->view->moduleOptionMenu = $moduleOptionMenu;
$this->view->plans = str_replace('2030-01-01', $this->lang->story->undetermined, $this->loadModel('productplan')->getPairsForStory($productID, $branch == 0 ? '' : $branch, 'skipParent|unexpired|noclosed'));
$this->view->planID = $planID;
$this->view->plans = str_replace('2030-01-01', $this->lang->story->undetermined, $this->loadModel('productplan')->getPairsForStory($productID, $branch == 0 ? '' : $branch, 'skipParent|unexpired|noclosed')); $this->view->planID = $planID;
$this->view->source = $source;
$this->view->sourceNote = $sourceNote;
$this->view->color = $color;
module/story/lang/de.php
+1 -1
View File
@@ -12,7 +12,7 @@
global $config;
$lang->story->create = "Story hinzufügen";
$lang->story->requirement = zget($lang, 'URCommon', "Requirement");
$lang->story->requirement = 'UR';
$lang->story->story = zget($lang, 'SRCommon', "Story");
$lang->story->createStory = 'Create ' . $lang->story->story;
$lang->story->createRequirement = 'Create ' . $lang->story->requirement;
module/story/lang/en.php
+1 -1
View File
@@ -12,7 +12,7 @@
global $config;
$lang->story->create = "Create Story";
$lang->story->requirement = zget($lang, 'URCommon', "Requirement");
$lang->story->requirement = 'UR';
$lang->story->story = zget($lang, 'SRCommon', "Story");
$lang->story->createStory = 'Create ' . $lang->story->story;
$lang->story->createRequirement = 'Create ' . $lang->story->requirement;
module/story/lang/fr.php
+1 -1
View File
@@ -12,7 +12,7 @@
global $config;
$lang->story->create = "Créer Story";
$lang->story->requirement = zget($lang, 'URCommon', "Requirement");
$lang->story->requirement = 'UR';
$lang->story->story = zget($lang, 'SRCommon', "Story");
$lang->story->createStory = 'Create ' . $lang->story->story;
$lang->story->createRequirement = 'Create ' . $lang->story->requirement;
module/story/model.php
+1 -1
View File
@@ -889,7 +889,7 @@ class storyModel extends model
return false;
}
$storyPlan = !empty($_POST['plan']) ? $_POST['plan'] : array();
$storyPlan = !empty($_POST['plan']) ? array_filter($_POST['plan']) : array();
if(count($storyPlan) > 1)
{
$oldStoryPlan = !empty($oldStory->planTitle) ? array_keys($oldStory->planTitle) : array();