diff --git a/module/story/model.php b/module/story/model.php index 085e5a6bd1..903ffc4e3f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1100,6 +1100,7 @@ class storyModel extends model $story->module = $data->modules[$storyID]; $story->plan = $oldStories[$storyID]->parent < 0 ? '' : $data->plans[$storyID]; $story->source = $data->sources[$storyID]; + $story->sourceNote = $data->sourceNote[$storyID]; $story->keywords = $data->keywords[$storyID]; $story->stage = isset($data->stages[$storyID]) ? $data->stages[$storyID] : $oldStory->stage; $story->closedBy = isset($data->closedBys[$storyID]) ? $data->closedBys[$storyID] : $oldStory->closedBy; diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 2c452cea59..d66df93b5e 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -89,8 +89,8 @@ '> - '> - '> + '> + '> '> story->categoryList, 'feature', "class='form-control chosen'");?> ' style='overflow:visible'> diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index 5f16b51bbe..d89a7ba00b 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -52,6 +52,7 @@ foreach(explode(',', $showFields) as $field) '> priAB;?> '> story->assignedTo;?> '> story->source;?> + '> story->sourceNote;?> story->status;?> '> story->stageAB;?> '>story->closedBy;?> @@ -109,7 +110,8 @@ foreach(explode(',', $showFields) as $field)
- title, "class='form-control input-story-title' disabled"); ?> + title, "class='form-control input-story-title' disabled"); ?> + title, "class='form-control input-story-title'"); ?>
@@ -127,7 +129,19 @@ foreach(explode(',', $showFields) as $field) story->categoryList, $story->category, 'class=form-control chosen');?> >pri, 'class=form-control');?> '>assignedTo, "class='form-control chosen'");?> - >source, 'class=form-control');?> + >source, "class='form-control chosen' id='source_$storyID'");?> + source == 'meeting' or $story->source == 'researchreport') + { + $objects = $story->source == 'meeting' ? $meetings : $researchReports; + $html = html::select("sourceNote[$storyID]", $objects, $story->sourceNote, "class='form-control chosen' id='sourceNote_$storyID'"); + } + else + { + $html = html::input("sourceNote[$storyID]", $story->sourceNote, "class='form-control' id='sourceNote_$storyID'"); + } + ?> + ' data-id="sourceNote;?>"> processStatus('story', $story);?> >stage, 'class="form-control"' . ($story->status == 'draft' ? ' disabled="disabled"' : ''));?> '>closedBy, "class='form-control" . ($story->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?>