lib/network_methods.rb @@ -42,7 +42,7 @@ class NewsItem < ActiveRecord::Base include HasTopics include AASMWithFixes include Sanitizy - include NetworkValidation + include NetworkMethods cleanse_columns(:delivery_description, :extended_description, :short_description, :external_links) do |sanitizer| sanitizer.allowed_tags.delete('div') @@ -56,7 +56,6 @@ class NewsItem < ActiveRecord::Base acts_as_paranoid aasm_column :status belongs_to :user - belongs_to :network belongs_to :category belongs_to :fact_checker, :class_name => 'User' has_many :comments, :as => :commentable, :dependent => :destroy @@ -70,7 +69,7 @@ class NewsItem < ActiveRecord::Base ":basename_:style.:extension", :default_url => "/images/featured_images/missing_:style.png" - validates_presence_of :headline, :user_id, :network_id + validates_presence_of :headline, :user_id if Rails.env.production? validates_attachment_content_type :featured_image, @@ -125,12 +124,6 @@ class NewsItem < ActiveRecord::Base is_a?(Pitch) end - def network_and_category - return "No network selected" unless network - output = network.display_name - output += "- #{category.name}" if category - output - end end app/models/news_item.rb @@ -44,7 +44,7 @@ class User < ActiveRecord::Base acts_as_paranoid include HasTopics include AASMWithFixes - include NetworkValidation + include NetworkMethods TYPES = ["Citizen", "Reporter", "Organization", "Admin"] CREATABLE_TYPES = TYPES - ["Admin"] @@ -66,7 +66,6 @@ class User < ActiveRecord::Base } end - belongs_to :network belongs_to :category has_many :donations do @@ -318,13 +317,6 @@ class User < ActiveRecord::Base pledges.exists?(:tip_id => tip.id ) end - def network_and_category - return "No network selected" unless network - output = network.display_name - output += "- #{category.name}" if category - output - end - protected def encrypt_password app/models/user.rb lib/network_validation.rb d5bf6dcf77e3bf32ac05286a7d71c91cdcc15e34 Veez (Matt Remsik) mremsik@gmail.com http://github.com/spot-us/spot-us/commit/fecdcdf38e18d8156726b25db054c7187f480ffd fecdcdf38e18d8156726b25db054c7187f480ffd 2009-03-09T09:39:38-07:00 2009-03-09T09:39:38-07:00 Refactor: network code in lib: network_methods b042b05c110dad68a726ee97c29d247d26128aba Veez (Matt Remsik) mremsik@gmail.com