erictyl
/
personal-conference
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

fix link error



See merge request !6
This commit is contained in:
wmcheng 2019-11-18 15:34:00 +08:00
parent eb68726fa7 5e19961fd4
commit 50e4a91ae9
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/admin/writing_conferences/index.html.erb
View File

@ -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">