Merge branch release/21.7.5 of zentao/zentaopms (#10829)

module/custom/js/set.ui.js

@@ -51,41 +51,3 @@ window.changeUnit = function()
     $defaultCurrencyPicker.render({items: defaultCurrencyItems});
     $defaultCurrencyPicker.$.setValue(defaultCurrency);
 }
-
-window.savaTestcaseReview = function()
-{
-    const url  = $("#settingForm").attr('action');
-    const form = new FormData($("#settingForm")[0]);
-    if(stopSubmit && oldNeedReview)
-    {
-        stopSubmit = false;
-
-        const needReview = $('input[name="needReview"]:checked').val();
-        if(needReview == 0)
-        {
-            $.ajaxSubmit({
-                url: $.createLink('testcase', 'ajaxGetReviewAmount'),
-                onComplete: function(count)
-                {
-                    stopSubmit = true;
-
-                    if(count == 0)
-                    {
-                        $.ajaxSubmit({url, data:form});
-                        return true;
-                    }
-
-                    zui.Modal.confirm(confirmReviewCase).then((result) =>
-                    {
-                        if(result) form.append('reviewCase', '1');
-                        $.ajaxSubmit({url, data:form});
-                    })
-                }
-            });
-
-            return false;
-        }
-    }
-
-    $.ajaxSubmit({url, data:form});
-}

module/custom/ui/set.html.php

@@ -274,12 +274,6 @@ elseif(in_array($module, array('epic', 'story', 'requirement', 'demand', 'testca
         );
 
         $actionWidth = 'w-2/3';
-        $formActions = array(array(
-            'text'    => $lang->save,
-            'type'    => 'primary',
-            'btnType' => 'button',
-            'onclick' => 'savaTestcaseReview()'
-        ));
     }
 }
 elseif($module == 'bug' && $field == 'longlife')

module/custom/zen.php

@@ -388,15 +388,6 @@ class customZen extends custom
         }
         $this->loadModel('setting')->setItems("system.testcase", $data);
 
-        $reviewCase = isset($data['reviewCase']) ? $data['reviewCase'] : 0;
-        if($data['needReview'] == 0 && $reviewCase)
-        {
-            $waitProductCases = $this->loadModel('testcase')->getByStatus(0, 0, 'all', 'wait');
-            $waitLibCases     = $this->loadModel('caselib')->getLibCases(0, 'wait');
-            $waitCaseIdList   = array_merge(array_keys($waitProductCases), array_keys($waitLibCases));
-            $this->testcase->batchReview($waitCaseIdList, 'pass');
-        }
-
         return !dao::isError();
     }
 }