Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

2021-07-19 14:43:54 +08:00
parent 53ea62affd 9a0addce6b
commit afa59e5190
47 changed files with 648 additions and 216 deletions
@@ -795,7 +795,7 @@ class bug extends control
            $files   = array();
            if($comment == false)
            {
-                $changes  = $this->bug->update($bugID);
+                $changes = $this->bug->update($bugID);
                if(dao::isError())
                {
                    if(defined('RUN_MODE') && RUN_MODE == 'api')
@@ -1591,6 +1591,7 @@ class bug extends control

            $this->executeHooks($bugID);

+            if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
            die(js::locate($this->session->bugList, 'parent'));
        }
    }