From 23957d02602932717c81bcf0cfbf786fe7cfce3c Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Sat, 1 Mar 2014 03:07:48 +0000
Subject: [PATCH] VRFS-756 fixed bugs

---
 web/app/assets/javascripts/invitationDialog.js.erb  | 12 ++++++------
 web/app/controllers/api_invited_users_controller.rb |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/app/assets/javascripts/invitationDialog.js.erb b/web/app/assets/javascripts/invitationDialog.js.erb
index e1803120b..1c4bb7703 100644
--- a/web/app/assets/javascripts/invitationDialog.js.erb
+++ b/web/app/assets/javascripts/invitationDialog.js.erb
@@ -81,13 +81,13 @@
         }
 
         function invalidEmails(emails) {
-            var invalid = [];
+            var badEmails = [];
             emails.map(function(email) {
-                if(!( /(.+)@(.+){2,}\.(.+){2,}/.test(email) )){
-                    invalid.push(email);
-                }        
-            };
-            return 0 < invalid.length ? invalid : null;
+                if (!( /(.+)@(.+){2,}\.(.+){2,}/.test(email) )){
+                    badEmails.push(email);
+                }
+            });
+            return badEmails;
         }
 
         // send invitations one after another, so as not to 'spam' the server very heavily.
diff --git a/web/app/controllers/api_invited_users_controller.rb b/web/app/controllers/api_invited_users_controller.rb
index ca8575ae9..3618dce56 100644
--- a/web/app/controllers/api_invited_users_controller.rb
+++ b/web/app/controllers/api_invited_users_controller.rb
@@ -20,19 +20,19 @@
   def create
     @invited_users = []
     if (emails = params[:emails]).present?
-      emails = emails.split(',')[0...Rails.application.max_email_invites_per_request].uniq
+      emails = emails[0...Rails.application.config.max_email_invites_per_request].uniq
       msg = params[:note].blank? ? nil : params[:note].strip
-      @invited_users = emails.collect do |email|
+      @invited_users = emails.collect do |ee|
         iu = InvitedUser.new
         iu.sender = current_user
-        iu.email = email.strip
+        iu.email = ee.strip
         iu.autofriend = true
         iu.note = msg
         iu.save
         iu
       end
     end
-    respond_with @invited_users, :responder => ApiResponder, :location => api_invited_user_detail_url(@invited_user)
+    respond_with @invited_users, :responder => ApiResponder, :location => invitations_url(@invited_users)
   end
 
 end