Merge branch 'fixbugs_zhouxin_21333' into 'master'

* Fix bug #21333.

See merge request easycorp/zentaopms!2668

module/task/js/create.js

@@ -235,19 +235,6 @@ function loadStories(executionID)
     setStories(moduleID, executionID);
 }
 
-/**
- * load stories of module.
- *
- * @access public
- * @return void
- */
-function loadModuleRelated()
-{
-    moduleID    = $('#module').val();
-    executionID = $('#execution').val();
-    setStories(moduleID, executionID);
-}
-
 /**
  * Set lane.
  *
@@ -498,7 +485,7 @@ $(document).ready(function()
         var extra    = $(this).prop('checked') ? 'allModule' : '';
         $('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + executionID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function()
         {
-            $('#moduleIdBox #module').val(moduleID).attr('onchange', "setStories(this.value, " + executionID + ")").chosen();
+            $('#moduleIdBox #module').val(moduleID).chosen();
         });
     });
 });

module/task/js/edit.js

@@ -70,19 +70,6 @@ function loadExecutionMembers(executionID)
     $('#assignedToIdBox').load(link, function(){$('#assignedToIdBox').find('select').chosen()});
 }
 
-/**
- * Load module related
- *
- * @access public
- * @return void
- */
-function loadModuleRelated()
-{
-    moduleID    = $('#module').val();
-    executionID = $('#execution').val();
-    loadExecutionStories(executionID, moduleID)
-}
-
 /* empty function. */
 function setPreview(){}
 
@@ -152,7 +139,7 @@ $(document).ready(function()
         var extra    = $(this).prop('checked') ? 'allModule' : '';
         $('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + executionID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function()
         {
-            $('#moduleIdBox #module').val(moduleID).attr('onchange', "loadModuleRelated()").chosen();
+            $('#moduleIdBox #module').val(moduleID).chosen();
         });
     });
 });

module/task/view/edit.html.php

@@ -101,7 +101,7 @@
                 <th class='thWidth'><?php echo $lang->task->module;?></th>
                 <td>
                   <div class='table-row'>
-                    <span class='table-col' id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control chosen" onchange="loadModuleRelated()"');?></span>
+                    <span class='table-col' id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control chosen"');?></span>
                     <span class='table-col text-middle pl-10px' id='showAllModuleBox'>
                       <div class="checkbox-primary">
                         <input type="checkbox" id="showAllModule" <?php if($showAllModule) echo 'checked';?>><label for="showAllModule" class="no-margin"><?php echo $lang->all;?></label>

module/tree/control.php

@@ -467,7 +467,7 @@ class tree extends control
             else
             {
                 $changeFunc = '';
-                if($viewType == 'task' or $viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
+                if($viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
                 $field = $fieldID ? "modules[$fieldID]" : 'module';
 
                 $currentModule   = $this->tree->getById($currentModuleID);