diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb index 528335625..682b63025 100644 --- a/app/models/bulk_update_request.rb +++ b/app/models/bulk_update_request.rb @@ -7,6 +7,7 @@ class BulkUpdateRequest < ActiveRecord::Base validates_presence_of :user validates_presence_of :script validates_presence_of :title + validates_presence_of :forum_topic, :message => "is invalid" validates_inclusion_of :status, :in => %w(pending approved rejected) validate :script_formatted_correctly attr_accessible :user_id, :forum_topic_id, :script, :title, :reason diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb index 2ce4917c2..4e1a6a34e 100644 --- a/app/models/forum_post.rb +++ b/app/models/forum_post.rb @@ -11,7 +11,7 @@ class ForumPost < ActiveRecord::Base after_create :update_topic_updated_at_on_create after_update :update_topic_updated_at_on_update_for_original_posts after_destroy :update_topic_updated_at_on_destroy - validates_presence_of :body, :creator_id + validates_presence_of :body, :creator_id, :topic validate :validate_topic_is_unlocked before_destroy :validate_topic_is_unlocked after_save :delete_topic_if_original_post