From 94c46a543740f118bdd14b40cb16984ebc8581c3 Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Wed, 17 Feb 2016 09:39:52 -0200
Subject: [PATCH] fix subjects and types
---
.../learning_objects_controller.rb | 2 +-
app/controllers/subjects_controller.rb | 26 -------------------
app/models/learning_object.rb | 2 +-
3 files changed, 2 insertions(+), 28 deletions(-)
delete mode 100644 app/controllers/subjects_controller.rb
diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb
index 102ef32d9..2c463af5a 100644
--- a/app/controllers/learning_objects_controller.rb
+++ b/app/controllers/learning_objects_controller.rb
@@ -21,7 +21,7 @@ class LearningObjectsController < ApplicationController
def new
@learning_object = LearningObject.new
@school_levels = ['EducaçÃĢo Infantil', 'Ensino Fundamental', 'Ensino MÃĐdio']
- # @subjects = Subject.default_list
+ @subjects = Topic.all.map{|x| x.name}.uniq
@types = LearningObject.default_types
@languages = Language.all
end
diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
deleted file mode 100644
index 1e669c08f..000000000
--- a/app/controllers/subjects_controller.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class SubjectsController < ApplicationController
-
- # GET /subjects
- # GET /subjects.json
- def index
- @subjects = Topic.all
- end
-
- # GET /subjects/1
- # GET /subjects/1.json
- def show
- @general = []
- mainPage = main_page_repository.all.first
- @general = mainPage["highlights"].take(3).collect do |id|
- LearningObject.find(id)
- end
- end
-
- private
-
- # Never trust parameters from the scary internet, only allow the white list through.
- def subject_params
- params[:subject_object]
- end
-
-end
diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index 11862709d..9f0a88ce9 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -51,7 +51,7 @@ class LearningObject < ActiveRecord::Base
def self.default_types
Rails.cache.fetch("cache/object_type", expires_in: 24.hours) do
- LearningObject.select(:object_type).uniq
+ LearningObject.group(:object_type).count.reject{|type, frequency| type.blank?}.map{|type, frequency| type}
end
end
--
GitLab