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

Merge pull request #3188 from evazion/fix-artcomm-versions-view

Browse Source 
Fix #3187: DText is not enabled on certain views
This commit is contained in:
Albert Yi
2017-06-26 16:38:08 -07:00
committed by GitHub
parent f0fe62f077 4681812607
commit d33b57b57e
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/artist_commentary_version.rb
View File

@@ -1,5 +1,6 @@
class ArtistCommentaryVersion < ApplicationRecord class ArtistCommentaryVersion < ApplicationRecord
before_validation :initialize_updater before_validation :initialize_updater
belongs_to :post
belongs_to :updater, :class_name => "User" belongs_to :updater, :class_name => "User"
scope :for_user, lambda {|user_id| where("updater_id = ?", user_id)} scope :for_user, lambda {|user_id| where("updater_id = ?", user_id)}
attr_accessible :post_id, :original_title, :original_description, :translated_title, :translated_description attr_accessible :post_id, :original_title, :original_description, :translated_title, :translated_description

18
app/views/artist_commentary_versions/index.html.erb
View File

@@ -2,6 +2,8 @@
<div id="a-index"> <div id="a-index">
<h1>Artist Commentary Changes</h1> <h1>Artist Commentary Changes</h1>
<%= render "posts/partials/common/inline_blacklist" %>
<table width="100%" class="striped"> <table width="100%" class="striped">
<thead> <thead>
<tr> <tr>
@@ -21,14 +23,24 @@
<tbody> <tbody>
<% @commentary_versions.each do |commentary_version| %> <% @commentary_versions.each do |commentary_version| %>
<tr> <tr>
<td><%= link_to commentary_version.post_id, post_path(commentary_version.post_id) %></td> <td>
<% if params.dig(:search, :post_id).present? %>
<%= link_to commentary_version.post_id, post_path(commentary_version.post_id) %>
<% else %>
<%= PostPresenter.preview(commentary_version.post, :tags => "status:any") %>
<% end %>
</td>
<td> <td>
<h3><%= h(commentary_version.original_title) %></h3> <h3><%= h(commentary_version.original_title) %></h3>
<%= h(commentary_version.original_description) %> <div class="prose">
<%= format_text(commentary_version.original_description) %>
</div>
</td> </td>
<td> <td>
<h3><%= h(commentary_version.translated_title) %></h3> <h3><%= h(commentary_version.translated_title) %></h3>
<%= h(commentary_version.translated_description) %> <div class="prose">
<%= format_text(commentary_version.translated_description) %>
</div>
</td> </td>
<% if CurrentUser.is_moderator? %> <% if CurrentUser.is_moderator? %>
<td> <td>