Merge branch 'master' into 'master'
fix link error See merge request !8
This commit is contained in:
commit
e8478468de
|
@ -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_books_path %>'
|
||||
}
|
||||
</script>
|
||||
<table class="table main-list">
|
||||
|
|
Loading…
Reference in New Issue