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

fixes #1424 for forum posts and topics

Browse Source
This commit is contained in:
Toks
2013-06-14 12:23:29 -04:00
parent 739da4c4b9
commit 029c050243
5 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/forum_posts/_form.html.erb
View File

@@ -2,8 +2,8 @@
<%= simple_form_for(forum_post) do |f| %>
<%= f.input :topic_id, :as => :hidden %>
<%= dtext_field "forum_post", "body" %>
<%= dtext_field "forum_post", "body", :value => forum_post.body, :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "forum_post", "body" %>
<%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>
<% end %>

11
app/views/forum_posts/_forum_post.html.erb
View File

@@ -32,9 +32,9 @@
<% end %>
<% if forum_post.editable_by?(CurrentUser.user) %>
<% if forum_post.is_original_post? %>
<li><%= link_to "Edit", edit_forum_topic_path(forum_post.topic) %></li>
<li><%= link_to "Edit", edit_forum_topic_path(forum_post.topic), :id => "edit_forum_topic_link_#{forum_post.topic.id}", :class => "edit_forum_topic_link" %></li>
<% else %>
<li><%= link_to "Edit", edit_forum_post_path(forum_post.id) %></li>
<li><%= link_to "Edit", edit_forum_post_path(forum_post.id), :id => "edit_forum_post_link_#{forum_post.id}", :class => "edit_forum_post_link" %></li>
<% end %>
<% end %>
<% if params[:controller] == "forum_posts" %>
@@ -42,6 +42,13 @@
<% else %>
<li><%= link_to "Permalink", forum_post_path(forum_post) %></li>
<% end %>
<% if forum_post.editable_by?(CurrentUser.user) %>
<% if forum_post.is_original_post? %>
<%= render "forum_topics/form", :forum_topic => forum_post.topic %>
<% else %>
<%= render "forum_posts/form", :forum_post => forum_post %>
<% end %>
<% end %>
</menu>
</div>
<div class="clearfix"></div>

10
app/views/forum_topics/_form.html.erb
View File

@@ -1,13 +1,13 @@
<div id="form-content">
<%= simple_form_for(@forum_topic) do |f| %>
<%= simple_form_for(forum_topic) do |f| %>
<%= f.input :title %>
<%= f.simple_fields_for :original_post do |pf| %>
<% if !@forum_topic.new_record? %>
<%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", @forum_topic.id %>
<% if !forum_topic.new_record? %>
<%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", forum_topic.id %>
<% end %>
<%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => @forum_topic.original_post.body %>
<%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => forum_topic.original_post.body, :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
<% end %>
<% if CurrentUser.is_janitor? %>
@@ -16,6 +16,6 @@
<% end %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "forum_post", "body" %>
<%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
<% end %>
</div>

2
app/views/forum_topics/edit.html.erb
View File

@@ -2,7 +2,7 @@
<div id="a-edit">
<h1>Edit Forum Topic</h1>
<%= render "form" %>
<%= render "form", :forum_topic => @forum_topic %>
</div>
</div>