diff --git a/ruby/lib/jam_ruby/models/lesson_session.rb b/ruby/lib/jam_ruby/models/lesson_session.rb index 8dd085eb3..113b608da 100644 --- a/ruby/lib/jam_ruby/models/lesson_session.rb +++ b/ruby/lib/jam_ruby/models/lesson_session.rb @@ -155,7 +155,7 @@ module JamRuby analysis = LessonSessionAnalyser.analyse(self) - self.analysis = analysis_to_json(analysis) + self.analysis = LessonSession.analysis_to_json(analysis) self.success = analysis[:bill] self.analysed_at = Time.now self.analysed = true diff --git a/web/app/assets/javascripts/react-components/mixins/PostProcessorMixin.js.coffee b/web/app/assets/javascripts/react-components/mixins/PostProcessorMixin.js.coffee index 1b75d8d98..2d6db86ee 100644 --- a/web/app/assets/javascripts/react-components/mixins/PostProcessorMixin.js.coffee +++ b/web/app/assets/javascripts/react-components/mixins/PostProcessorMixin.js.coffee @@ -55,7 +55,7 @@ teacherActions = window.JK.Actions.Teacher user.musician_profile = '/client#/profile/' + user.id user.best_profile = user.musician_profile - if user.is_a_teacher + if user.is_a_teacher && user.teacher? cheapest_lesson_stmt = '(no pricing set yet)' lowestPrice = null lowestDuration = null diff --git a/web/app/views/layouts/client.html.erb b/web/app/views/layouts/client.html.erb index b77ca9351..26d142709 100644 --- a/web/app/views/layouts/client.html.erb +++ b/web/app/views/layouts/client.html.erb @@ -9,6 +9,9 @@ <%= stylesheet_link_tag "client/client", media: "all" %> <%= include_gon %> + <% if Rails.env.test? %> + <%= javascript_include_tag "sinon" %> + <% end %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %>