Skip to content

Commit

Permalink
Merge pull request otwcode#477 from elzj/issue-1404-edit-drafts
Browse files Browse the repository at this point in the history
Issue 1404: Allow users to save changes to work and chapter drafts
  • Loading branch information
neuroalien committed Mar 9, 2012
2 parents 5af6217 + c1ffe14 commit 0391019
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion app/controllers/works_controller.rb
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions app/views/chapters/preview_edit.html.erb
Expand Up @@ -7,13 +7,14 @@
<%= render :partial => 'hidden_fields', :locals => {:form => f} %>

<p class="submit actions">
<% 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' %>
</p>

<% end %>
17 changes: 9 additions & 8 deletions app/views/works/preview.html.erb
Expand Up @@ -43,15 +43,16 @@
<%= render :partial => 'hidden_fields', :locals => {:form => f} %>

<fieldset>
<legend><%= t('.post_work', :default => 'Post Work') %></legend>
<legend><%= ts('Post Work') %></legend>
<p class="submit cancel edit actions">
<% 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' %>
</p>
</fieldset>

Expand Down

0 comments on commit 0391019

Please sign in to comment.