Mercurial > hg > soundsoftware-site
changeset 1324:2e54ae6ab02f redmine-2.2-integration
Searches the projects (to which to add a publication to).
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Wed, 19 Jun 2013 18:17:33 +0100 |
| parents | e1899e896dbc |
| children | 4ef7df804bab |
| files | plugins/redmine_bibliography/app/helpers/publications_helper.rb plugins/redmine_bibliography/app/views/publications/_add_project_form.html.erb plugins/redmine_bibliography/config/routes.rb |
| diffstat | 3 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/redmine_bibliography/app/helpers/publications_helper.rb Wed Jun 19 16:39:58 2013 +0100 +++ b/plugins/redmine_bibliography/app/helpers/publications_helper.rb Wed Jun 19 18:17:33 2013 +0100 @@ -18,7 +18,7 @@ end end - s + s.html_safe end
--- a/plugins/redmine_bibliography/app/views/publications/_add_project_form.html.erb Wed Jun 19 16:39:58 2013 +0100 +++ b/plugins/redmine_bibliography/app/views/publications/_add_project_form.html.erb Wed Jun 19 18:17:33 2013 +0100 @@ -1,29 +1,26 @@ -<%= form_for(:publication, - :remote => true, - :url => {:controller => 'publications', :action => 'add_project', :id => @publication, :project_id => @project}, +<%= form_for(:publication, + :remote => true, + :url => {:controller => 'publications', :action => 'add_project', :id => @publication, :project_id => @project}, :method => :post, - :html => { :id => 'add_project_form' }, + :html => { :id => 'add_project_form' }, :loading => "$('project-add-submit').disable()", :complete => "$('project-add-submit').enable()") do |f| %> - + <fieldset><legend><%=l(:label_add_project_to_publication)%></legend> <p> <%= label_tag "project_search", l(:label_project_search) %><%= text_field_tag 'project_search', nil %> </p> - - observe_field(:project_search, - :frequency => 0.5, - :update => :projects, - :url => { :controller => 'publications', :action => 'autocomplete_for_project', :id => @publication }, - :with => 'q') - - <div id="projects"> + <%= javascript_tag "observeSearchfield('project_search', 'projects', '#{ escape_javascript url_for(:controller => 'publications', + :action => 'autocomplete_for_project', + :id => @publication.id) }')" %> + + <div id="projects"> <% if params[:q] && params[:q].length > 1 %> <%= projects_check_box_tags 'project[project_ids][]', @projects %> <% end %> </div> - <p><%= submit_tag l(:button_add), :id => 'project-add-submit' %></p> + <p><%= submit_tag l(:button_add), :id => 'project-add-submit' %></p> </fieldset> <% end %>
--- a/plugins/redmine_bibliography/config/routes.rb Wed Jun 19 16:39:58 2013 +0100 +++ b/plugins/redmine_bibliography/config/routes.rb Wed Jun 19 18:17:33 2013 +0100 @@ -7,6 +7,8 @@ match "publications/add_project/:id", :to => 'publications#add_project' + match "publications/autocomplete_for_project", :to => 'publications#autocomplete_for_project' + resources :publications end \ No newline at end of file