fixed tests
This commit is contained in:
@@ -7,7 +7,7 @@ class Artist < ActiveRecord::Base
|
||||
belongs_to :creator, :class_name => "User"
|
||||
has_many :members, :class_name => "Artist", :foreign_key => "group_name", :primary_key => "name"
|
||||
has_many :urls, :dependent => :destroy, :class_name => "ArtistUrl"
|
||||
has_many :versions, :order => "artist_versions.id", :class_name => "ArtistVersion"
|
||||
has_many :versions, :order => "artist_versions.id ASC", :class_name => "ArtistVersion"
|
||||
has_one :wiki_page, :foreign_key => "title", :primary_key => "name"
|
||||
has_one :tag_alias, :foreign_key => "antecedent_name", :primary_key => "name"
|
||||
accepts_nested_attributes_for :wiki_page
|
||||
|
||||
@@ -3,7 +3,7 @@ class Pool < ActiveRecord::Base
|
||||
validates_format_of :name, :with => /\A[^\s;,]+\Z/, :on => :create, :message => "cannot have whitespace, commas, or semicolons"
|
||||
belongs_to :creator, :class_name => "User"
|
||||
belongs_to :updater, :class_name => "User"
|
||||
has_many :versions, :class_name => "PoolVersion", :dependent => :destroy
|
||||
has_many :versions, :class_name => "PoolVersion", :dependent => :destroy, :order => "pool_versions.id ASC"
|
||||
before_validation :normalize_name
|
||||
before_validation :initialize_creator, :on => :create
|
||||
after_save :create_version
|
||||
|
||||
@@ -16,7 +16,7 @@ class Post < ActiveRecord::Base
|
||||
belongs_to :parent, :class_name => "Post"
|
||||
has_one :unapproval, :dependent => :destroy
|
||||
has_one :upload, :dependent => :destroy
|
||||
has_many :versions, :class_name => "PostVersion", :dependent => :destroy
|
||||
has_many :versions, :class_name => "PostVersion", :dependent => :destroy, :order => "post_versions.id ASC"
|
||||
has_many :votes, :class_name => "PostVote", :dependent => :destroy
|
||||
has_many :notes, :dependent => :destroy
|
||||
has_many :comments
|
||||
|
||||
@@ -2,6 +2,7 @@ class Unapproval < ActiveRecord::Base
|
||||
class Error < Exception ; end
|
||||
|
||||
belongs_to :unapprover, :class_name => "User"
|
||||
belongs_to :post
|
||||
validates_presence_of :reason, :unapprover_id, :unapprover_ip_addr
|
||||
before_validation :initialize_unapprover, :on => :create
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ class WikiPage < ActiveRecord::Base
|
||||
scope :titled, lambda {|title| where(["title = ?", title.downcase.tr(" ", "_")])}
|
||||
has_one :tag, :foreign_key => "name", :primary_key => "title"
|
||||
has_one :artist, :foreign_key => "name", :primary_key => "title"
|
||||
has_many :versions, :class_name => "WikiPageVersion", :dependent => :destroy
|
||||
has_many :versions, :class_name => "WikiPageVersion", :dependent => :destroy, :order => "wiki_page_versions.id ASC"
|
||||
|
||||
def self.build_relation(options = {})
|
||||
relation = where()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<% form_tag(posts_path, :method => "get") do %>
|
||||
<%= form_tag(posts_path, :method => "get") do %>
|
||||
<%= text_field_tag("tags", params[:tags], :size => 15) %>
|
||||
<%= submit_tag "Go" %>
|
||||
<% end %>
|
||||
|
||||
@@ -32,9 +32,8 @@
|
||||
<h2>Help</h2>
|
||||
<ul>
|
||||
<li><%= link_to "I don't have an account", new_user_path %></li>
|
||||
<li><%= link_to "I forgot my password", reset_password_info_path %></li>
|
||||
<li><%= link_to "I forgot my login", login_reminder_info_path %></li>
|
||||
<li><%= link_to "I want to delete my account", delete_account_info_path %></li>
|
||||
<li><%= link_to "I forgot my password", reset_password_path %></li>
|
||||
<li><%= link_to "I forgot my login", login_reminder_path %></li>
|
||||
</ul>
|
||||
</aside>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<% form_for @user do |f| %>
|
||||
<%= form_for @user do |f| %>
|
||||
<p>Hover over the labels to see a brief explanation of the setting. Required fields are marked in red.</p>
|
||||
|
||||
<fieldset>
|
||||
|
||||
Reference in New Issue
Block a user