VRFS-1669 VRFS-1672 bug fixes

web/app/assets/javascripts/findSession.js

@@ -99,10 +99,8 @@
       // date filter
       var date = $('#session-date-filter').val();
       if (date !== null && date.length > 0) {
-        console.log(date);
         currentQuery.day = context.JK.formatDateYYYYMMDD(date);
-        // console.log("currentQuery.day=%o", currentQuery.day);
-        currentQuery.timezone_offset = new Date().getTimezoneOffset();
+        currentQuery.timezone_offset = (new Date().getTimezoneOffset()) / 60;
       }
 
       // language filter

web/app/assets/javascripts/jam_rest.js

@@ -132,7 +132,9 @@
         }
 
         function updateSession(id, newSession) {
-            return $.ajax('/api/sessions/' + id, {
+            console.log("newSession=%o", newSession);
+            return $.ajax({
+                url: '/api/sessions/' + id,
                 type: "PUT",
                 data : newSession,
                 dataType : 'json'

web/app/assets/javascripts/sessionList.js

@@ -54,7 +54,8 @@
       // render users who have approved RSVPs
       if (session.approved_rsvps) {
         for (i=0; i < session.approved_rsvps.length; i++) {
-          if (!(session.approved_rsvps[i].id in inSessionUsers))  {
+          // do not show the user in this section if he is already in the session
+          if ($.inArray(session.approved_rsvps[i].id, inSessionUsers) === -1) {
             if (session.approved_rsvps[i].id === context.JK.currentUserId) {
               showJoinLink = true;
             }
@@ -62,6 +63,9 @@
             rsvpUsersHtml += rsvpUserInfo[0];
             latencyHtml += rsvpUserInfo[1];
           }
+          else {
+            showJoinLink = false;
+          }
         }
       }
 

web/app/assets/javascripts/sessionSettingsDialog.js

@@ -67,7 +67,7 @@
 
       var data = {};
 
-      data.genre = $('#session-settings-genre').val();
+      data.genre = context.JK.GenreSelectorHelper.getSelectedGenres('#session-settings-genre')[0];
       data.name = $('#session-settings-name').val();
       data.description = $('#session-settings-description').val();
       data.language = $('#session-settings-language').val();

web/app/views/clients/_sessionSettings.html.haml

@@ -59,7 +59,7 @@
         .clearall.right.mt10
           %a.button-orange{:href => 'TBD', :rel => 'external'} HELP
           %a.button-grey{'layout-action' => "close"} CANCEL
-          %a.button-orange{:id => "session-settings-dialog-submit", :href => "#"} UPDATE SETTINGS
+          %a.button-orange{:id => "session-settings-dialog-submit"} UPDATE SETTINGS
 
         %br/
         %br{:clear => 'all'}/