From b88842b4c0e1da340f625bc2884e5c7551e4025d Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Wed, 12 Mar 2014 16:35:57 +0800 Subject: [PATCH 1/2] * code for task#1830. --- module/task/js/create.js | 3 ++- module/task/js/edit.js | 26 -------------------------- module/task/view/edit.html.php | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index 6df7fe95f0..dd087e34a2 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -89,9 +89,10 @@ function setStories(moduleID, projectID) $.get(link, function(stories) { var storyID = $('#story').val(); - if(!stories) stories = ''; + if(!stories) stories = ''; $('#story').replaceWith(stories); $('#story').val(storyID); + setPreview(); $('#story_chzn').remove(); $("#story").chosen({no_results_text: ''}); }); diff --git a/module/task/js/edit.js b/module/task/js/edit.js index 938d40f223..1d73ab05ed 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -66,31 +66,5 @@ function loadProjectMembers(projectID) $('#assignedToIdBox').load(link); } -/** - * load stories of module. - * - * @access public - * @return void - */ -function loadModuleRelated() -{ - moduleID = $('#module').val(); - projectID = $('#project').val(); - setStories(moduleID, projectID); -} - -/* Get select of stories.*/ -function setStories(moduleID, projectID) -{ - link = createLink('story', 'ajaxGetProjectStories', 'projectID=' + projectID + '&productID=0&moduleID=' + moduleID); - $.get(link, function(stories) - { - if(!stories) stories = ''; - $('#story').replaceWith(stories); - $('#story_chzn').remove(); - $("#story").chosen({no_results_text: ''}); - }); -} - /* empty function. */ function setPreview(){} diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 938ed51d57..ffb4c6a78b 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -56,7 +56,7 @@ task->module;?> - module, 'class="select-1" onchange="loadModuleRelated()"');?> + module, 'class="select-1"');?> task->story;?> From 38be92fde0f6b7a1f44c1a48dc6270938815d608 Mon Sep 17 00:00:00 2001 From: wwccss Date: Wed, 12 Mar 2014 17:04:01 +0800 Subject: [PATCH 2/2] * code for task#1829. --- module/task/js/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index 6df7fe95f0..8d35e0f142 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -16,7 +16,7 @@ function setOwners(result) $('#assignedTo').attr('size', 4); $('#assignedTo').attr('multiple', 'multiple'); } - else + else if($('#assignedTo').attr('multiple') == 'multiple') { $('#assignedTo').removeAttr('size'); $('#assignedTo').removeAttr('multiple');