diff --git a/app/controllers/event/camp/kinds_controller.rb b/app/controllers/event/camp/kinds_controller.rb index 651f8997..b8c1e8c6 100644 --- a/app/controllers/event/camp/kinds_controller.rb +++ b/app/controllers/event/camp/kinds_controller.rb @@ -6,12 +6,6 @@ class Event::Camp::KindsController < SimpleCrudController self.permitted_attrs = [:label] - private - - def list_entries - super.list - end - class << self def model_class Event::Camp::Kind diff --git a/app/controllers/event/course/conditions_controller.rb b/app/controllers/event/course/conditions_controller.rb index 8ccb3642..7831b526 100644 --- a/app/controllers/event/course/conditions_controller.rb +++ b/app/controllers/event/course/conditions_controller.rb @@ -7,7 +7,7 @@ class Event::Course::ConditionsController < SimpleCrudController self.nesting = Group self.permitted_attrs = [:content, :label] - self.sort_mappings = {content: {joins: [:rich_text_content], order: ["action_text_rich_texts.body"]}} + self.sort_mappings = {content: "action_text_rich_texts.body"} helper_method :group