erictyl
/
personal-journal
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:33:40 +08:00
parent 7be5334673 51007ebc63
commit a7d031f0c6
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/journal_papers/index.html.erb
View File

@ -1,17 +1,7 @@
<script src="https://kit.fontawesome.com/1fa49cfdc9.js" crossorigin="anonymous"></script> <script src="https://kit.fontawesome.com/1fa49cfdc9.js" crossorigin="anonymous"></script>
<script> <script>
function MergeUrl(){ function MergeUrl(){
var temp_url = location.href location.href = '<%= merge_admin_journal_papers_path %>'
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"
}
} }
</script> </script>
<table class="table main-list"> <table class="table main-list">