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

Merge branch 'sprint/tianshujie_bug12154' into 'master'

Browse Source 
* Fix bug #12154.

See merge request easycorp/zentaopms!3121
This commit is contained in:
朱金勇
2022-04-26 07:04:02 +00:00
parent e6c8709cd2 ec28d24b8d
commit ced683f5f5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+4 -4
View File
@@ -457,14 +457,14 @@ class storyModel extends model
$stories = $result['data'];
$module = 0;
$plan = 0;
$plan = '';
$pri = 0;
$source = '';
foreach($stories->title as $i => $title)
{
$module = $stories->module[$i] == 'ditto' ? $module : $stories->module[$i];
$plan = isset($stories->plan[$i]) ? ($stories->plan[$i] == 'ditto' ? $plan : $stories->plan[$i]) : 0;
$plan = isset($stories->plan[$i]) ? ($stories->plan[$i] == 'ditto' ? $plan : $stories->plan[$i]) : '';
$pri = $stories->pri[$i] == 'ditto' ? $pri : $stories->pri[$i];
$source = $stories->source[$i] == 'ditto' ? $source : $stories->source[$i];
$stories->module[$i] = (int)$module;
@@ -1520,7 +1520,7 @@ class storyModel extends model
$newStory = new stdClass();
$newStory->parent = '-1';
$newStory->plan = 0;
$newStory->plan = '';
$newStory->lastEditedBy = $this->app->user->account;
$newStory->lastEditedDate = $now;
$newStory->childStories = trim($oldStory->childStories . ',' . $childStories, ',');
@@ -1624,7 +1624,7 @@ class storyModel extends model
$story->duplicateStory = $data->duplicateStoryIDList[$storyID] ? $data->duplicateStoryIDList[$storyID] : $oldStory->duplicateStory;
$story->childStories = $data->childStoriesIDList[$storyID] ? $data->childStoriesIDList[$storyID] : $oldStory->childStories;
if($story->closedReason != 'done') $story->plan = 0;
if($story->closedReason != 'done') $story->plan = '';
$stories[$storyID] = $story;
unset($story);
module/todo/css/create.css
+1
View File
@@ -6,3 +6,4 @@
.cycleConfig .tab-pane .input-group {width: 380px;}
.nameBox {display: grid;}
.pri-selector > .btn {padding: 5px 12px;}
#assignedTo_chosen.chosen-container .chosen-results {max-height: 180px;}