Merge branch 'sprint/master_zhoxudong_15984' into 'master'

* Fix bug #15984. See merge request easycorp/zentaopms!2419
2022-03-22 02:43:35 +00:00
parent ffae3aa899 d74e5c4c58
commit 7127d6e8ab
1 changed files with 2 additions and 6 deletions
@@ -2895,11 +2895,7 @@ class execution extends control
            $this->execution->unlinkStory($executionID, $storyID);

            /* if kanban then reload and if ajax request then send result. */
-            if(isonlybody())
-            {
-                return print(js::reload('parent'));
-            }
-            elseif(helper::isAjaxRequest())
+            if(helper::isAjaxRequest())
            {
                if(dao::isError())
                {
@@ -2913,7 +2909,7 @@ class execution extends control
                }
                return $this->send($response);
            }
-            return print(js::locate($this->app->session->storyList, 'parent'));
+            return print(js::reload('parent'));
        }
    }