Merge branch 'autocomplete' into publication
* autocomplete: add autocomplete js
This commit is contained in:
commit
613bbec1f0
|
@ -18,6 +18,11 @@ class Desktop::JournalPagesController < ApplicationController
|
||||||
@level_types = JournalLevelType.all
|
@level_types = JournalLevelType.all
|
||||||
@author_types = JournalAuthorType.all
|
@author_types = JournalAuthorType.all
|
||||||
@paper_types= JournalPaperType.all
|
@paper_types= JournalPaperType.all
|
||||||
|
@co_author_candidate =
|
||||||
|
CoAuthor.where(name_id: current_user.id).map{|c|c.co_author}
|
||||||
|
@journal_candidate =
|
||||||
|
WritingJournal.where(create_user_id: current_user.id).map{|j|j.journal_title}.uniq
|
||||||
|
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { render :layout => false}
|
format.html { render :layout => false}
|
||||||
|
|
|
@ -207,3 +207,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<script>
|
||||||
|
orbitDesktop.initializeJournals.prototype.autocomplete = { "journal_title" : <%= @journal_candidate %>, "co_authors_candidate" : <%= @co_author_candidate %> }
|
||||||
|
</script>
|
||||||
|
|
Loading…
Reference in New Issue