Pull from master

2018-04-19 10:49:25 +06:30
parent 70ec80a1d5
commit 0241d209ac
28 changed files with 529 additions and 220 deletions
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -115,7 +115,8 @@
          url: "/settings/menus/" + menu_id + "/export",
          success: function(result){
            if(result.status){
-              swal("Success", "Export Success...", "success");
+              location.href = result.path.substring(6);
+              // swal("Success", "Export Success...", "success");
            }
          }
        });