seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-4083 - switched sender name in email

This commit is contained in:
Seth Call 2016-05-19 14:45:26 -05:00
parent a8e367041e
commit cdadc8bff4
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruby/lib/jam_ruby/app/mailers/user_mailer.rb
View File

@ -681,14 +681,14 @@ module JamRuby
def student_lesson_accepted(lesson_session, message, slot) def student_lesson_accepted(lesson_session, message, slot)
@slot = slot @slot = slot
if slot.is_teacher_created? if slot.is_teacher_approved?
@target = lesson_session.student @target = lesson_session.student
@sender = lesson_session.teacher @sender = lesson_session.teacher
@subject = "Your have confirmed a lesson!" @subject = "Your lesson request is confirmed!"
else else
@target = lesson_session.teacher @target = lesson_session.teacher
@sender = lesson_session.student @sender = lesson_session.student
@subject = "Your lesson request is confirmed!" @subject = "Your have confirmed a lesson!"
end end
@lesson_session = lesson_session @lesson_session = lesson_session
@message = message @message = message
@ -709,14 +709,14 @@ module JamRuby
def teacher_lesson_accepted(lesson_session, message, slot) def teacher_lesson_accepted(lesson_session, message, slot)
@slot = slot @slot = slot
if slot.is_teacher_created? if slot.is_teacher_approved?
@target = lesson_session.student @target = lesson_session.student
@sender = lesson_session.teacher @sender = lesson_session.teacher
@subject = "Your lesson time change is confirmed by #{lesson_session.student.name}!" @subject = "You have confirmed a lesson!"
else else
@target = lesson_session.teacher @target = lesson_session.teacher
@sender = lesson_session.student @sender = lesson_session.student
@subject = "You have confirmed a lesson!" @subject = "Your lesson time change is confirmed by #{lesson_session.student.name}!"
end end
@lesson_session = lesson_session @lesson_session = lesson_session
@ -739,13 +739,13 @@ module JamRuby
def student_lesson_update_all(lesson_session, message, slot) def student_lesson_update_all(lesson_session, message, slot)
@slot = slot @slot = slot
if slot.is_teacher_created? if slot.is_teacher_created?
@target = lesson_session.student
@sender = lesson_session.teacher
subject = "All lesson times changed with #{lesson_session.student.name}!"
else
@target = lesson_session.teacher @target = lesson_session.teacher
@sender = lesson_session.student @sender = lesson_session.student
subject = "All lesson times changed with #{lesson_session.student.name}!" subject = "All lesson times changed with #{lesson_session.teacher.name}!"
else
@target = lesson_session.student
@sender = lesson_session.teacher
subject = "All lesson times changed with #{lesson_session.teacher.name}!"
end end
@lesson_session = lesson_session @lesson_session = lesson_session
@message = message @message = message
@ -767,13 +767,13 @@ module JamRuby
def teacher_lesson_update_all(lesson_session, message, slot) def teacher_lesson_update_all(lesson_session, message, slot)
@slot = slot @slot = slot
if slot.is_teacher_created? if slot.is_teacher_created?
@target = lesson_session.student
@sender = lesson_session.teacher
subject = "All lesson times changed with #{lesson_session.student.name}!"
else
@target = lesson_session.teacher @target = lesson_session.teacher
@sender = lesson_session.student @sender = lesson_session.student
subject = "All lesson times changed with #{lesson_session.student.name}!" subject = "All lesson times changed with #{lesson_session.student.name}!"
else
@target = lesson_session.student
@sender = lesson_session.teacher
subject = "All lesson times changed with #{lesson_session.student.name}!"
end end
@lesson_session = lesson_session @lesson_session = lesson_session

1
web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee
View File

@ -710,6 +710,7 @@ UserStore = context.UserStore
{this.userHeader(this.myself())} {this.userHeader(this.myself())}
Your request has been sent. You will receive an email when {this.teacher().name} responds. Your request has been sent. You will receive an email when {this.teacher().name} responds.
</div> </div>
<LessonBookingDecision {...this.decisionProps([])} />
</div>` </div>`
joinSessionNow: (e) -> joinSessionNow: (e) ->