Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'

* Fix bug.

See merge request easycorp/zentaopms!4706

module/bug/css/linkbugs.css

@@ -1,2 +1,2 @@
-.main-table  {height: 600px !important}
+.main-table  {height: 80% !important}
 #mainContent {min-height: 400px;}

module/story/control.php

@@ -1049,10 +1049,11 @@ class story extends control
      * Change a story.
      *
      * @param  int    $storyID
+     * @param  string $from
      * @access public
      * @return void
      */
-    public function change($storyID)
+    public function change($storyID, $from = '')
     {
         if(!empty($_POST))
         {
@@ -1095,7 +1096,7 @@ class story extends control
                         $kanbanData    = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
-                    else
+                    if($from == 'taskkanban')
                     {
                         $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
                         $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $taskSearchValue);
@@ -1385,7 +1386,7 @@ class story extends control
                         $kanbanData    = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
-                    else
+                    if($from == 'taskkanban')
                     {
                         $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
                         $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $taskSearchValue);