# HG changeset patch # User luisf # Date 1307207281 -3600 # Node ID b461f84ed41a7905ffe52a4be619eaf76bd11c55 # Parent 27930c9b424dfda327b9c0684a3f86b2bd43ed15 Publications: Routes for regular REST behaviour; Import view and controller action; New beahviour for new action. diff -r 27930c9b424d -r b461f84ed41a vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb --- a/vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb Thu Jun 02 14:39:11 2011 +0100 +++ b/vendor/plugins/redmine_bibliography/app/controllers/publications_controller.rb Sat Jun 04 18:08:01 2011 +0100 @@ -5,15 +5,13 @@ unloadable def new - # we always try to create at least one publication - @publication = Publication.new + @publication = Publication.new # the step we're at in the form @publication.current_step = session[:publication_step] @new_publications = [] session[:publications] ||= {} - end def create @@ -53,6 +51,7 @@ end def edit + @publication = Publication.find(params[:id]) end @@ -145,10 +144,10 @@ end author.authorships.create!( - :publication => @publication, - :institution => institution, - :email => email, - :order => idx) + :publication => @publication, + :institution => institution, + :email => email, + :order => idx) end end @@ -158,6 +157,11 @@ end + def import + @publication = Publication.new + + + end def review_new_entries diff -r 27930c9b424d -r b461f84ed41a vendor/plugins/redmine_bibliography/app/views/publications/import.html.erb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_bibliography/app/views/publications/import.html.erb Sat Jun 04 18:08:01 2011 +0100 @@ -0,0 +1,12 @@ +

New Publication

+ +<% form_for @publication, :url => { :action => "create" } do |f| %> + <% f.error_messages %> + + <%= render :partial => "#{@publication.current_step}_bibtex_step", :locals => { :f => f } %> + +

<%= f.submit "Submit" %>

+

<%= f.submit "Back", :name => "back_button" unless @publication.first_step? %>

+ +<% end %> + diff -r 27930c9b424d -r b461f84ed41a vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb --- a/vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb Thu Jun 02 14:39:11 2011 +0100 +++ b/vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb Sat Jun 04 18:08:01 2011 +0100 @@ -1,12 +1,4 @@

New Publication

-<% form_for @publication, :url => { :action => "create" } do |f| %> - <% f.error_messages %> +<%= render :partial => 'edit' %> - <%= render :partial => "#{@publication.current_step}_bibtex_step", :locals => { :f => f } %> - -

<%= f.submit "Submit" %>

-

<%= f.submit "Back", :name => "back_button" unless @publication.first_step? %>

- -<% end %> - diff -r 27930c9b424d -r b461f84ed41a vendor/plugins/redmine_bibliography/config/routes.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_bibliography/config/routes.rb Sat Jun 04 18:08:01 2011 +0100 @@ -0,0 +1,3 @@ +ActionController::Routing::Routes.draw do |map| + map.resources :publications +end \ No newline at end of file