Merge branch 'fix-activerecord-migration'

app/controllers/learning_objects_controller.rb

@@ -111,7 +111,7 @@ class LearningObjectsController < ApplicationController
 
   def build_subjects(subjects)
     subjects.map do |subject|
-      subject_repository.find subject
+      Topic.find subject
     end
   end
 

app/controllers/search_controller.rb

 class SearchController < ApplicationController
   def index
-    @types = learning_object_repository.types
+    @types = LearningObject.default_types
 
     @subjects = Topic.default_list
 

app/models/language.rb

 class Language < ActiveRecord::Base
-  include RepositoriesProxy
-  include Metadatable
 
-  attr_accessor :id, :name, :code
+  has_many :learning_object
+
 end

app/models/learning_object.rb

@@ -13,6 +13,8 @@ class LearningObject < ActiveRecord::Base
 
   belongs_to :publisher, polymorphic: true
 
+  belongs_to :language
+
   validates_presence_of :name, :id_dspace
   validates_uniqueness_of :id_dspace
 

db/migrate/20160217114036_create_languages.rb

+class CreateLanguages < ActiveRecord::Migration
+  def change
+    create_table :languages do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

db/migrate/20160217114745_remove_language_from_learning_object.rb

+class RemoveLanguageFromLearningObject < ActiveRecord::Migration
+  def change
+    remove_column :learning_objects, :language, :string
+  end
+end