From c1ffe141077d5b4c2a7498b577e51895c1787d79 Mon Sep 17 00:00:00 2001 From: elz Date: Wed, 15 Feb 2012 22:48:43 -0500 Subject: [PATCH] Issue 1404: Allow users to save changes to work and chapter drafts without posting them. --- app/controllers/works_controller.rb | 2 +- app/views/chapters/preview_edit.html.erb | 15 ++++++++------- app/views/works/preview.html.erb | 17 +++++++++-------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7c208b9f0f7..5eefac6c3a2 100755 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -398,7 +398,7 @@ def update @included = 0 end end - @work.posted = true + @work.posted = true if params[:post_button] @work.minor_version = @work.minor_version + 1 @work.set_challenge_info saved = @work.save diff --git a/app/views/chapters/preview_edit.html.erb b/app/views/chapters/preview_edit.html.erb index 5e63262aaf5..f258287ca10 100644 --- a/app/views/chapters/preview_edit.html.erb +++ b/app/views/chapters/preview_edit.html.erb @@ -7,13 +7,14 @@ <%= render :partial => 'hidden_fields', :locals => {:form => f} %>

- <% if @chapter.posted? %> - <%= submit_tag t('.forms.update', :default => 'Update'), :name => 'update_button' %> - <% else %> - <%= submit_tag t('.forms.post', :default => 'Post'), :name => 'post_button' %> - <% end %> - <%= submit_tag t('.forms.edit', :default => 'Edit'), :name => 'edit_button' %> - <%= submit_tag t('.forms.cancel', :default => 'Cancel'), :name => 'cancel_button' %> + <% if @chapter.posted? %> + <%= submit_tag ts('Update'), :name => 'update_button' %> + <% else %> + <%= submit_tag ts('Post'), :name => 'post_button' %> + <%= submit_tag ts("Save Without Posting"), :name => 'save_button' %> + <% end %> + <%= submit_tag ts('Edit'), :name => 'edit_button' %> + <%= submit_tag ts('Cancel'), :name => 'cancel_button' %>

<% end %> \ No newline at end of file diff --git a/app/views/works/preview.html.erb b/app/views/works/preview.html.erb index 297fd5e920b..1efb551dbef 100755 --- a/app/views/works/preview.html.erb +++ b/app/views/works/preview.html.erb @@ -34,15 +34,16 @@ <%= render :partial => 'hidden_fields', :locals => {:form => f} %>
- <%= t('.post_work', :default => 'Post Work') %> + <%= ts('Post Work') %>

- <% if @work.posted? %> - <%= submit_tag t('.forms.update', :default => 'Update'), :name => 'update_button' %> - <% else %> - <%= submit_tag t('.forms.post', :default => 'Post'), :name => 'post_button' %> - <% end %> - <%= submit_tag t('.forms.edit', :default => 'Edit'), :name => 'edit_button' %> - <%= submit_tag t('.forms.cancel', :default => 'Cancel'), :name => 'cancel_button' %> + <% if @work.posted? %> + <%= submit_tag ts('Update'), :name => 'update_button' %> + <% else %> + <%= submit_tag ts('Post'), :name => 'post_button' %> + <%= submit_tag ts('Save Without Posting'), :name => 'save_button' %> + <% end %> + <%= submit_tag ts('Edit'), :name => 'edit_button' %> + <%= submit_tag ts('Cancel'), :name => 'cancel_button' %>