ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Jacob Fugal 2013-10-28 14:58:47 -06:00
parent c3901aa3c3
commit a888abbdf4
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/calendar_event.rb
View File

@ -606,7 +606,11 @@ class CalendarEvent < ActiveRecord::Base
class IcalEvent class IcalEvent
include Api include Api
include ActionController::UrlWriter if CANVAS_RAILS2
include ActionController::UrlWriter
else
include Rails.application.routes.url_helpers
end
include TextHelper include TextHelper
def initialize(event) def initialize(event)

6
app/models/conversation_message.rb
View File

@ -17,7 +17,11 @@
# #
class ConversationMessage < ActiveRecord::Base class ConversationMessage < ActiveRecord::Base
include ActionController::UrlWriter if CANVAS_RAILS2
include ActionController::UrlWriter
else
include Rails.application.routes.url_helpers
end
include SendToStream include SendToStream
include SimpleTags::ReaderInstanceMethods include SimpleTags::ReaderInstanceMethods

6
app/models/discussion_topic/materialized_view.rb
View File

@ -21,7 +21,11 @@
class DiscussionTopic::MaterializedView < ActiveRecord::Base class DiscussionTopic::MaterializedView < ActiveRecord::Base
include Api::V1::DiscussionTopics include Api::V1::DiscussionTopics
include Api include Api
include ActionController::UrlWriter if CANVAS_RAILS2
include ActionController::UrlWriter
else
include Rails.application.routes.url_helpers
end
attr_accessible :discussion_topic attr_accessible :discussion_topic

6
app/models/message.rb
View File

@ -18,7 +18,11 @@
class Message < ActiveRecord::Base class Message < ActiveRecord::Base
# Included modules # Included modules
include ActionController::UrlWriter if CANVAS_RAILS2
include ActionController::UrlWriter
else
include Rails.application.routes.url_helpers
end
include ERB::Util include ERB::Util
include SendToStream include SendToStream
include TextHelper include TextHelper

6
app/presenters/take_quiz_presenter.rb
View File

@ -1,5 +1,9 @@
class TakeQuizPresenter class TakeQuizPresenter
include ActionController::UrlWriter if CANVAS_RAILS2
include ActionController::UrlWriter
else
include Rails.application.routes.url_helpers
end
include ApplicationHelper include ApplicationHelper
attr_accessor :quiz, attr_accessor :quiz,