saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'autocomplete' into publication 

* autocomplete:
  add autocomplete js
This commit is contained in:
Rueshyna 2012-11-26 14:44:52 +08:00
parent f2d1b0eaf7 065d38c797
commit 613bbec1f0
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/desktop/journal_pages_controller.rb
View File

@ -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}
@ -26,7 +31,7 @@ class Desktop::JournalPagesController < ApplicationController
end end
def edit def edit
@writing_journal= WritingJournal.find(params[:id]) @writing_journal = WritingJournal.find(params[:id])
@level_types = JournalLevelType.all @level_types = JournalLevelType.all
@author_types = JournalAuthorType.all @author_types = JournalAuthorType.all
@paper_types= JournalPaperType.all @paper_types= JournalPaperType.all

3
app/views/desktop/journal_pages/_form.html.erb
View File

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