Skip to content

Commit

Permalink
Merge 9b16952 into 7fc2fb4
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Sep 23, 2013
2 parents 7fc2fb4 + 9b16952 commit 712af1e
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions sufia-models/app/models/local_authority.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
require 'rdf/rdfxml'

class LocalAuthority < ActiveRecord::Base
deprecated_attr_accessible :name
# TODO we should add an index on this join table and remove the uniq query
has_and_belongs_to_many :domain_terms, :uniq=> true
deprecated_attr_accessible :name

if Rails::VERSION::MAJOR >= 4
# TODO we should add an index on this join table and remove the uniq query
has_and_belongs_to_many :domain_terms, -> { uniq }
else
has_and_belongs_to_many :domain_terms, :uniq=> true
end

has_many :local_authority_entries

def self.harvest_rdf(name, sources, opts = {})
Expand Down

0 comments on commit 712af1e

Please sign in to comment.