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-1875 fix action button for RSVP notification

This commit is contained in:
Brian Smith 2014-07-06 16:15:39 -04:00
parent 4872c037ad
commit 627a403009
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app/assets/javascripts/notificationPanel.js
View File

@ -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"
}]
);

8
web/app/assets/javascripts/rsvpSubmitDialog.js
View File

@ -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);