don't include ActionController::UrlWriter w/rails3
refs CNVS-9166 include Rails.application.routes.url_helpers instead (in most of these, should be refactored to not include those either, but not going down that rabbit hole in this commit.) Change-Id: I3a7091ac604c811d9b7ad2777c289fc8c6477822 test-plan: N/A Reviewed-on: https://gerrit.instructure.com/25725 Reviewed-by: Jacob Fugal <jacob@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> Product-Review: Jacob Fugal <jacob@instructure.com> QA-Review: Jacob Fugal <jacob@instructure.com>
This commit is contained in:
parent
c3901aa3c3
commit
a888abbdf4
|
@ -606,7 +606,11 @@ class CalendarEvent < ActiveRecord::Base
|
|||
|
||||
class IcalEvent
|
||||
include Api
|
||||
include ActionController::UrlWriter
|
||||
if CANVAS_RAILS2
|
||||
include ActionController::UrlWriter
|
||||
else
|
||||
include Rails.application.routes.url_helpers
|
||||
end
|
||||
include TextHelper
|
||||
|
||||
def initialize(event)
|
||||
|
|
|
@ -17,7 +17,11 @@
|
|||
#
|
||||
|
||||
class ConversationMessage < ActiveRecord::Base
|
||||
include ActionController::UrlWriter
|
||||
if CANVAS_RAILS2
|
||||
include ActionController::UrlWriter
|
||||
else
|
||||
include Rails.application.routes.url_helpers
|
||||
end
|
||||
include SendToStream
|
||||
include SimpleTags::ReaderInstanceMethods
|
||||
|
||||
|
|
|
@ -21,7 +21,11 @@
|
|||
class DiscussionTopic::MaterializedView < ActiveRecord::Base
|
||||
include Api::V1::DiscussionTopics
|
||||
include Api
|
||||
include ActionController::UrlWriter
|
||||
if CANVAS_RAILS2
|
||||
include ActionController::UrlWriter
|
||||
else
|
||||
include Rails.application.routes.url_helpers
|
||||
end
|
||||
|
||||
attr_accessible :discussion_topic
|
||||
|
||||
|
|
|
@ -18,7 +18,11 @@
|
|||
|
||||
class Message < ActiveRecord::Base
|
||||
# Included modules
|
||||
include ActionController::UrlWriter
|
||||
if CANVAS_RAILS2
|
||||
include ActionController::UrlWriter
|
||||
else
|
||||
include Rails.application.routes.url_helpers
|
||||
end
|
||||
include ERB::Util
|
||||
include SendToStream
|
||||
include TextHelper
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
class TakeQuizPresenter
|
||||
include ActionController::UrlWriter
|
||||
if CANVAS_RAILS2
|
||||
include ActionController::UrlWriter
|
||||
else
|
||||
include Rails.application.routes.url_helpers
|
||||
end
|
||||
include ApplicationHelper
|
||||
|
||||
attr_accessor :quiz,
|
||||
|
|
Loading…
Reference in New Issue