From 5e19961fd48ef26918d9242562c6c36850c94941 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Sat, 16 Nov 2019 13:56:34 +0800
Subject: [PATCH] fix link error

---
 app/views/admin/writing_conferences/index.html.erb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/views/admin/writing_conferences/index.html.erb b/app/views/admin/writing_conferences/index.html.erb
index d4fea0e..6dfc132 100644
--- a/app/views/admin/writing_conferences/index.html.erb
+++ b/app/views/admin/writing_conferences/index.html.erb
@@ -1,17 +1,7 @@
 <script src="https://kit.fontawesome.com/1fa49cfdc9.js" crossorigin="anonymous"></script>
 <script>
 function MergeUrl(){
-  var temp_url = location.href
-  if (temp_url.search("locale=")!=-1){
-    var tp=temp_url.lastIndexOf('/')
-    location.href = temp_url.substring(0,tp+1)+"merge/"+temp_url.substring(tp+1)
-  }
-  else if (temp_url.slice(-1)=='/'){
-    location.href = location.href + "merge"
-  }
-  else{
-    location.href = location.href + "/merge"
-  }
+  location.href = '<%= merge_admin_writing_conferences_path %>'
 }
 </script>
 <table class="table main-list">