Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
albert
2013-03-31 22:18:37 -04:00
2 changed files with 2 additions and 1 deletions

View File

@@ -4,6 +4,7 @@ class WikiPage < ActiveRecord::Base
before_validation :initialize_updater
after_save :create_version
belongs_to :creator, :class_name => "User"
belongs_to :updater, :class_name => "User"
validates_uniqueness_of :title, :case_sensitive => false
validates_presence_of :title
validate :validate_locker_is_janitor

View File

@@ -16,7 +16,7 @@
<% @wiki_pages.each do |wiki_page| %>
<tr>
<td class="tag-category-<%= wiki_page.category_name %>"><%= link_to wiki_page.pretty_title, wiki_page_path(wiki_page, :noredirect => 1) %></td>
<td><%= wiki_page.updated_at.strftime("%Y-%m-%d %I:%M") %> by <%= h link_to wiki_page.updater_name, user_path(wiki_page.updater_id) %></td>
<td><%= wiki_page.updated_at.strftime("%Y-%m-%d %I:%M") %> by <%= h link_to wiki_page.updater_name, user_path(wiki_page.updater_id), { :class => wiki_page.updater.level_class } %></td>
</tr>
<% end %>
</tbody>