Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wyd621
2014-03-13 01:16:25 +00:00
3 changed files with 4 additions and 29 deletions
+3 -2
View File
@@ -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');
@@ -89,9 +89,10 @@ function setStories(moduleID, projectID)
$.get(link, function(stories)
{
var storyID = $('#story').val();
if(!stories) stories = '<select id="story" name="story"></select>';
if(!stories) stories = '<select id="story" name="story" class="select-1"></select>';
$('#story').replaceWith(stories);
$('#story').val(storyID);
setPreview();
$('#story_chzn').remove();
$("#story").chosen({no_results_text: ''});
});
-26
View File
@@ -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 = '<select id="story" name="story"></select>';
$('#story').replaceWith(stories);
$('#story_chzn').remove();
$("#story").chosen({no_results_text: ''});
});
}
/* empty function. */
function setPreview(){}
+1 -1
View File
@@ -56,7 +56,7 @@
</tr>
<tr>
<th class='rowhead w-p20'><?php echo $lang->task->module;?></th>
<td><span id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="select-1" onchange="loadModuleRelated()"');?></span></td>
<td><span id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="select-1"');?></span></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->story;?></th>