AR select and order options do not take an array
This problem was hidden in 1.8 because Array#to_s is an alias for Array#join , but manifests itself in 1.9 where it aliases Array#inspect Change-Id: I118696cdc129f71f31997ad852d8d7c6d3ad0fc9 Reviewed-on: https://gerrit.instructure.com/5842 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Jon Jensen <jon@instructure.com>
This commit is contained in:
parent
ead2a3344a
commit
471943632e
|
@ -24,7 +24,7 @@ class ContextModulesController < ApplicationController
|
|||
def index
|
||||
if authorized_action(@context, @current_user, :read)
|
||||
@modules = @context.context_modules.active
|
||||
@collapsed_modules = ContextModuleProgression.for_user(@current_user).for_modules(@modules).scoped(:select => ['context_module_id, collapsed']).select{|p| p.collapsed? }.map(&:context_module_id)
|
||||
@collapsed_modules = ContextModuleProgression.for_user(@current_user).for_modules(@modules).scoped(:select => 'context_module_id, collapsed').select{|p| p.collapsed? }.map(&:context_module_id)
|
||||
if @context.grants_right?(@current_user, session, :participate_as_student)
|
||||
return unless tab_enabled?(@context.class::TAB_MODULES)
|
||||
ContextModule.send(:preload_associations, @modules, [:context_module_progressions, :content_tags])
|
||||
|
|
|
@ -606,7 +606,7 @@ class CoursesController < ApplicationController
|
|||
when 'modules'
|
||||
add_crumb(t('#crumbs.modules', "Modules"))
|
||||
@modules = @context.context_modules.active
|
||||
@collapsed_modules = ContextModuleProgression.for_user(@current_user).for_modules(@modules).scoped(:select => ['context_module_id, collapsed']).select{|p| p.collapsed? }.map(&:context_module_id)
|
||||
@collapsed_modules = ContextModuleProgression.for_user(@current_user).for_modules(@modules).scoped(:select => 'context_module_id, collapsed').select{|p| p.collapsed? }.map(&:context_module_id)
|
||||
when 'syllabus'
|
||||
add_crumb(t('#crumbs.syllabus', "Syllabus"))
|
||||
@groups = @context.assignment_groups.active.find(:all, :order => 'position, name')
|
||||
|
|
|
@ -37,7 +37,7 @@ class OutcomesController < ApplicationController
|
|||
if @context == @outcome.context
|
||||
codes = "all"
|
||||
else
|
||||
codes = @context.all_courses.scoped({:select => [:id]}).map(&:asset_string)
|
||||
codes = @context.all_courses.scoped({:select => 'id'}).map(&:asset_string)
|
||||
end
|
||||
end
|
||||
@tags = @outcome.content_tags.active.for_context(@context)
|
||||
|
@ -64,7 +64,7 @@ class OutcomesController < ApplicationController
|
|||
if @context == @outcome.context
|
||||
codes = "all"
|
||||
else
|
||||
codes = @context.all_courses.scoped({:select => [:id]}).map(&:asset_string)
|
||||
codes = @context.all_courses.scoped({:select => 'id'}).map(&:asset_string)
|
||||
end
|
||||
end
|
||||
@results = @outcome.learning_outcome_results.for_context_codes(codes).custom_ordering(params[:sort]).paginate(:page => params[:page], :per_page => 10)
|
||||
|
|
|
@ -83,7 +83,7 @@ class DiscussionEntry < ActiveRecord::Base
|
|||
|
||||
on_create_send_to_streams do
|
||||
if self.parent_id == 0
|
||||
recent_entries = DiscussionEntry.active.find(:all, :select => ['user_id'], :conditions => ['discussion_entries.discussion_topic_id=? AND discussion_entries.created_at > ?', self.discussion_topic_id, 2.weeks.ago])
|
||||
recent_entries = DiscussionEntry.active.find(:all, :select => 'user_id', :conditions => ['discussion_entries.discussion_topic_id=? AND discussion_entries.created_at > ?', self.discussion_topic_id, 2.weeks.ago])
|
||||
# If the topic has been going for more than two weeks and it suddenly
|
||||
# got "popular" again, move it back up in user streams
|
||||
if !self.discussion_topic.for_assignment? && self.created_at && self.created_at > self.discussion_topic.created_at + 2.weeks && recent_entries.select{|e| e.created_at && e.created_at > 24.hours.ago }.length > 10
|
||||
|
@ -225,7 +225,7 @@ class DiscussionEntry < ActiveRecord::Base
|
|||
end
|
||||
|
||||
named_scope :for_user, lambda{|user|
|
||||
{:conditions => ['discussion_entries.user_id = ?', (user.is_a?(User) ? user.id : user)], :order => ['discussion_entries.created_at']}
|
||||
{:conditions => ['discussion_entries.user_id = ?', (user.is_a?(User) ? user.id : user)], :order => 'discussion_entries.created_at'}
|
||||
}
|
||||
named_scope :after, lambda{|date|
|
||||
{:conditions => ['created_at > ?', date] }
|
||||
|
|
|
@ -132,7 +132,7 @@ class LearningOutcome < ActiveRecord::Base
|
|||
if @tied_context == context
|
||||
codes = "all"
|
||||
else
|
||||
codes = @tied_context.all_courses.scoped({:select => [:id]}).map(&:asset_string)
|
||||
codes = @tied_context.all_courses.scoped({:select => 'id'}).map(&:asset_string)
|
||||
end
|
||||
end
|
||||
self.learning_outcome_results.for_context_codes(codes).count
|
||||
|
|
Loading…
Reference in New Issue