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

module/branch/js/manage.js

@@ -126,7 +126,7 @@ $(function()
         }
 
         var branchNames = Object.values(branchPairs);
-        if(isChecked && branchNames.includes($('#name').val()) !== -1)
+        if(isChecked && branchNames.indexOf($('#name').val()) !== -1)
         {
             alert(branchLang.existName);
             return false;

module/product/control.php

@@ -775,7 +775,7 @@ class product extends control
             $this->executeHooks($productID);
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
-            die(js::locate($this->createLink('product', 'browse'), 'parent'));
+            die(js::locate($this->createLink('product', 'all'), 'parent'));
         }
     }