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-756 fixed bugs

This commit is contained in:
Jonathan Kolyer 2014-03-01 03:07:48 +00:00
parent af1186d0ef
commit 23957d0260
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/app/assets/javascripts/invitationDialog.js.erb
View File

@ -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.

8
web/app/controllers/api_invited_users_controller.rb
View File

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