jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2828 from evazion/fix-artcomms

Browse Source 
Fix artist commentary dialog submitting wrong form.
This commit is contained in:
Albert Yi
2017-01-11 10:54:08 -08:00
committed by GitHub
parent 48c3920216 34b6f22594
commit d0dbe9605e
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/artist_commentaries.js
View File

@@ -36,7 +36,7 @@
width: 500, width: 500,
buttons: { buttons: {
"Submit": function() { "Submit": function() {
$("#add-commentary-dialog form").submit(); $("#add-commentary-dialog #edit-commentary").submit();
$(this).dialog("close"); $(this).dialog("close");
}, },
"Cancel": function() { "Cancel": function() {
@@ -45,7 +45,7 @@
} }
}); });
$('#add-commentary-dialog form').submit(function() { $('#add-commentary-dialog #edit-commentary').submit(function() {
$('#add-commentary-dialog').dialog('close'); $('#add-commentary-dialog').dialog('close');
}); });

22
app/views/artist_commentaries/_form.html.erb
View File

@@ -4,36 +4,36 @@
<div class="input"> <div class="input">
<label>Copy from</label> <label>Copy from</label>
<%= select_tag :commentary_source_type, options_for_select(%w[Source Post]) %> <%= select_tag :commentary_source_type, options_for_select(%w[Source Post]) %>
<%= text_field_tag :commentary_source, @post.source %> <%= text_field_tag :commentary_source, post.source %>
<%= text_field_tag :commentary_post_id, (@post.parent.try(&:id) || @post.children.first.try(&:id)), :style => "display: none;" %> <%= text_field_tag :commentary_post_id, (post.parent.try(&:id) || post.children.first.try(&:id)), :style => "display: none;" %>
<%= button_tag "Fetch" %> <%= button_tag "Fetch" %>
</div> </div>
</form> </form>
<%= form_tag(create_or_update_artist_commentaries_path(:format => :js), :remote => true, :class => "simple_form", :method => :put) do %> <%= form_tag(create_or_update_artist_commentaries_path(:format => :js), :remote => true, :id => "edit-commentary", :class => "simple_form", :method => :put) do %>
<%= hidden_field :artist_commentary, :post_id, :value => @post.id %> <%= hidden_field :artist_commentary, :post_id, :value => post.id %>
<div class="input"> <div class="input">
<label for="artist_commentary_original_title">Original title</label> <label for="artist_commentary_original_title">Original title</label>
<%= text_field :artist_commentary, :original_title, :value => artist_commentary.try(:original_title) %> <%= text_field :artist_commentary, :original_title, :value => post.artist_commentary.try(:original_title) %>
</div> </div>
<div class="input"> <div class="input">
<label for="artist_commentary_original_description">Original description</label> <label for="artist_commentary_original_description">Original description</label>
<%= text_area :artist_commentary, :original_description, :size => "40x6", :value => artist_commentary.try(:original_description) %> <%= text_area :artist_commentary, :original_description, :size => "40x6", :value => post.artist_commentary.try(:original_description) %>
</div> </div>
<div class="input"> <div class="input">
<label for="artist_commentary_translated_title">Translated title</label> <label for="artist_commentary_translated_title">Translated title</label>
<%= text_field :artist_commentary, :translated_title, :value => artist_commentary.try(:translated_title) %> <%= text_field :artist_commentary, :translated_title, :value => post.artist_commentary.try(:translated_title) %>
</div> </div>
<div class="input"> <div class="input">
<label for="artist_commentary_translated_description">Translated description</label> <label for="artist_commentary_translated_description">Translated description</label>
<%= text_area :artist_commentary, :translated_description, :size => "40x6", :value => artist_commentary.try(:translated_description) %> <%= text_area :artist_commentary, :translated_description, :size => "40x6", :value => post.artist_commentary.try(:translated_description) %>
</div> </div>
<% if @post.has_tag?("commentary") %> <% if post.has_tag?("commentary") %>
<div class="input"> <div class="input">
<label> <label>
<%= check_box :artist_commentary, :remove_commentary_tag %> <%= check_box :artist_commentary, :remove_commentary_tag %>
@@ -49,7 +49,7 @@
</div> </div>
<% end %> <% end %>
<% if @post.has_tag?("commentary_request") %> <% if post.has_tag?("commentary_request") %>
<div class="input"> <div class="input">
<label> <label>
<%= check_box :artist_commentary, :remove_commentary_request_tag %> <%= check_box :artist_commentary, :remove_commentary_request_tag %>
@@ -65,7 +65,7 @@
</div> </div>
<% end %> <% end %>
<% if @post.has_tag?("check_commentary") %> <% if post.has_tag?("check_commentary") %>
<div class="input"> <div class="input">
<label> <label>
<%= check_box :artist_commentary, :remove_commentary_check_tag %> <%= check_box :artist_commentary, :remove_commentary_check_tag %>

2
app/views/posts/show.html.erb
View File

@@ -130,7 +130,7 @@
</div> </div>
<div id="add-commentary-dialog" title="Add artist commentary" style="display: none;"> <div id="add-commentary-dialog" title="Add artist commentary" style="display: none;">
<%= render "artist_commentaries/form", :artist_commentary => @post.artist_commentary %> <%= render "artist_commentaries/form", :post => @post %>
</div> </div>
<div id="add-to-favgroup-dialog" title="Add to favorite group" style="display: none;"> <div id="add-to-favgroup-dialog" title="Add to favorite group" style="display: none;">