From 627a40300924ab6f9e4a970687d0b31f431e1bb0 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 6 Jul 2014 16:15:39 -0400 Subject: [PATCH] VRFS-1875 fix action button for RSVP notification --- web/app/assets/javascripts/notificationPanel.js | 11 +++++++---- web/app/assets/javascripts/rsvpSubmitDialog.js | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/web/app/assets/javascripts/notificationPanel.js b/web/app/assets/javascripts/notificationPanel.js index 45ef22914..fde7bf6ca 100644 --- a/web/app/assets/javascripts/notificationPanel.js +++ b/web/app/assets/javascripts/notificationPanel.js @@ -364,7 +364,11 @@ linkSessionInfoNotification(payload, $notification, $btnNotificationAction); } else if (type === context.JK.MessageType.SCHEDULED_SESSION_RSVP) { - linkSessionInfoNotification(payload, $notification, $btnNotificationAction); + var $action_btn = $notification.find($btnNotificationAction); + $action_btn.text('MANAGE RSVP'); + $action_btn.click(function() { + context.location = "/client#/account/sessionDetail/" + payload.session_id; + }); } else if (type === context.JK.MessageType.SCHEDULED_SESSION_RSVP_APPROVED) { linkSessionInfoNotification(payload, $notification, $btnNotificationAction); @@ -827,10 +831,9 @@ "icon_url": context.JK.resolveAvatarUrl(payload.photo_url) }, [{ id: "btn-view-profile", - text: "View Profile", + text: "Manage RSVP", "layout-action": "close", - href: JK.root_url + "/client#/profile/" + payload.user_id, - rel: "external", + href: "/client#/account/sessionDetail/" + payload.session_id, "class": "button-orange" }] ); diff --git a/web/app/assets/javascripts/rsvpSubmitDialog.js b/web/app/assets/javascripts/rsvpSubmitDialog.js index 0b37a72f9..141e26ddf 100644 --- a/web/app/assets/javascripts/rsvpSubmitDialog.js +++ b/web/app/assets/javascripts/rsvpSubmitDialog.js @@ -21,8 +21,12 @@ if (response) { $('.session-name', $screen).html(response.name); - var timestamp = new Date(response.scheduled_start).toDateString() + ', ' + - context.JK.formatUtcTime(new Date(response.scheduled_start), false); + var timestamp = "Date and time TBD"; + + if (response.scheduled_start) { + timestamp = new Date(response.scheduled_start).toDateString() + ', ' + + context.JK.formatUtcTime(new Date(response.scheduled_start), false); + } $('.scheduled-start', $screen).html(timestamp);