From d6f26b6cd6020d3561a49b76476a0303d629a06d Mon Sep 17 00:00:00 2001 From: Bert Owen Date: Wed, 2 Jul 2014 22:43:04 +0200 Subject: [PATCH] fix tests --- web/app/assets/javascripts/accounts_session_detail.js | 4 ++-- web/app/views/api_music_sessions/show_history.rabl | 2 +- web/app/views/clients/_account_session_detail.html.haml | 2 +- web/app/views/clients/_inviteMusicians.html.erb | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/app/assets/javascripts/accounts_session_detail.js b/web/app/assets/javascripts/accounts_session_detail.js index 2eaab1cdf..f8d18255e 100644 --- a/web/app/assets/javascripts/accounts_session_detail.js +++ b/web/app/assets/javascripts/accounts_session_detail.js @@ -35,7 +35,7 @@ function inviteMusicians(e) { e.preventDefault(); - context.JK.app.layout.showDialog('select-invites'); + invitationDialog.showEmailDialog(); } function cancelRsvpRequest(rsvpId) { @@ -227,7 +227,7 @@ rsvpHtml = context._.template( $("#template-account-session-rsvp").html(), - {user_id: request.id, avatar_url: avatar_url, + {id: request.id, avatar_url: avatar_url, user_name: request.name, instruments: instrumentLogoHtml, latency: latencyHtml}, {variable: 'data'} diff --git a/web/app/views/api_music_sessions/show_history.rabl b/web/app/views/api_music_sessions/show_history.rabl index 0be4fc700..92a1a3a93 100644 --- a/web/app/views/api_music_sessions/show_history.rabl +++ b/web/app/views/api_music_sessions/show_history.rabl @@ -36,7 +36,7 @@ else end node :scheduled_start do |start| - start.scheduled_start.utc.strftime("%a %e %B %Y %H:%M:%S") + start.scheduled_start.strftime("%a %e %B %Y %H:%M:%S") if start.scheduled_start end child(:creator => :creator) { diff --git a/web/app/views/clients/_account_session_detail.html.haml b/web/app/views/clients/_account_session_detail.html.haml index caf1fa9df..0d3c195b9 100644 --- a/web/app/views/clients/_account_session_detail.html.haml +++ b/web/app/views/clients/_account_session_detail.html.haml @@ -108,7 +108,7 @@ %td {{data.latency}} .right - %a{href: "#", class: 'button-orange declineRsvpRequest'} CANCEL + %a{href: "#", class: 'button-orange declineRsvpRequest', 'request-id' => "{{data.id}}"} CANCEL .clearall %script{type: 'text/template', id: 'template-account-session-properties'} diff --git a/web/app/views/clients/_inviteMusicians.html.erb b/web/app/views/clients/_inviteMusicians.html.erb index a5b7df44a..82370a924 100644 --- a/web/app/views/clients/_inviteMusicians.html.erb +++ b/web/app/views/clients/_inviteMusicians.html.erb @@ -15,7 +15,8 @@