Merge branch 'devops23_21095' into 'master'

Fix bug#21095,21093 See merge request easycorp/zentaopms!2625
2022-03-30 01:05:29 +00:00
parent b77563e431 d9e58c3f17
commit bb121a405a
2 changed files with 3 additions and 0 deletions
@@ -32,6 +32,8 @@ class build extends control
            if(empty($executionID)) dao::$errors['execution'] = $this->lang->build->emptyExecution;
            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));

+            if(defined('TUTORIAL')) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true)); // Fix bug #21095.
+
            $buildID = $this->build->create($executionID);
            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
            $this->loadModel('action')->create('build', $buildID, 'opened');
@@ -169,6 +169,7 @@ $(function()
        }

        if($(ele).hasClass('create-bug-btn') || $(ele).hasClass('create-story-btn')) container = '#mainMenu'; // Fix bug #21092.
+        if(!container && $(ele).hasClass('form-control')) container = '.table-form'; // Fix bug #21093

        $e.closest('body').find('.tooltip-tutorial').tooltip('destroy');
        var offset   = $e.offset();