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

module/story/control.php

@@ -351,7 +351,7 @@ class story extends control
         }
 
         $this->commonAction($storyID);
-  
+
         /* Assign. */
         $story   = $this->story->getById($storyID, 0, true);
         $product = $this->loadModel('product')->getById($story->product);
@@ -366,9 +366,9 @@ class story extends control
 
     /**
      * Batch edit story.
-     * 
-     * @param  int    $productID 
-     * @param  int    $projectID 
+     *
+     * @param  int    $productID
+     * @param  int    $projectID
      * @access public
      * @return void
      */
@@ -1157,13 +1157,13 @@ class story extends control
 
     /**
      * AJAX: get stories of a product in html select.
-     * 
-     * @param  int    $productID 
-     * @param  int    $moduleID 
-     * @param  int    $storyID 
-     * @param  string $onlyOption 
-     * @param  string $status 
-     * @param  int    $limit 
+     *
+     * @param  int    $productID
+     * @param  int    $moduleID
+     * @param  int    $storyID
+     * @param  string $onlyOption
+     * @param  string $status
+     * @param  int    $limit
      * @access public
      * @return void
      */

module/testcase/control.php

@@ -193,9 +193,9 @@ class testcase extends control
 
     /**
      * Create a test case.
-     * 
-     * @param  int    $productID 
-     * @param  int    $moduleID 
+     *
+     * @param  int    $productID
+     * @param  int    $moduleID
      * @param  string $from
      * @param  int    $param
      * @access public
@@ -205,7 +205,7 @@ class testcase extends control
     {
         $testcaseID = $from == 'testcase' ? $param : 0;
         $bugID      = $from == 'bug' ? $param : 0;
-        
+
         $this->loadModel('story');
         if(!empty($_POST))
         {

module/testcase/js/common.js

@@ -15,7 +15,7 @@ function loadAll(productID)
 
 /**
  * Load by branch.
- * 
+ *
  * @access public
  * @return void
  */
@@ -29,7 +29,7 @@ function loadBranch()
 
 /**
  * Load product branches.
- * 
+ *
  * @param  int $productID 
  * @access public
  * @return void
@@ -49,7 +49,7 @@ function loadProductBranches(productID)
 
 /**
  * Load stories of module. 
- * 
+ *
  * @access public
  * @return void
  */
@@ -60,7 +60,7 @@ function loadModuleRelated()
 
 /**
  * Load module.
- * 
+ *
  * @param  int    $productID 
  * @access public
  * @return void
@@ -109,7 +109,7 @@ function setStories()
     productID = $('#product').val();
     branch    = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
-    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=noclosed&limit=50');
+    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=''&limit=50');
     $.get(link, function(stories)
     {
         var value = $('#story').val();

module/testcase/view/create.html.php

@@ -26,7 +26,7 @@
     </div>
   </div>
   <form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' data-type='ajax'>
-    <table class='table table-form'> 
+    <table class='table table-form'>
       <tr>
         <th class='w-80px'><?php echo $lang->testcase->product;?></th>
         <td class='w-p45-f'>
@@ -78,7 +78,7 @@
             </span>
           </div>
         </td>
-      </tr>  
+      </tr>
       <?php endif;?>
       <tr>
         <th><?php echo $lang->testcase->title;?></th>