diff --git a/ruby/lib/jam_ruby/constants/limits.rb b/ruby/lib/jam_ruby/constants/limits.rb index a0932a389..bbbe44fd7 100644 --- a/ruby/lib/jam_ruby/constants/limits.rb +++ b/ruby/lib/jam_ruby/constants/limits.rb @@ -17,6 +17,5 @@ module Limits MAX_INSTRUMENTS_PER_MUSICIAN = 5 # users - USERS_CAN_INVITE = false # in BETA release, only first level users can invite others - + USERS_CAN_INVITE = true end diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 17e4ed46b..4af4515d3 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -775,7 +775,7 @@ module JamRuby else # if you are invited by an admin, we'll say you can invite too. # but if not, then you can not invite - user.can_invite = invited_user.invited_by_administrator? + user.can_invite = Limits::USERS_CAN_INVITE #invited_user.invited_by_administrator? # if you came in from an invite and used the same email to signup, # then we know you are a real human and that your email is valid. diff --git a/ruby/spec/jam_ruby/models/music_session_spec.rb b/ruby/spec/jam_ruby/models/music_session_spec.rb index 46d182a71..7e6efebe8 100644 --- a/ruby/spec/jam_ruby/models/music_session_spec.rb +++ b/ruby/spec/jam_ruby/models/music_session_spec.rb @@ -72,7 +72,7 @@ describe MusicSession do user2 = FactoryGirl.create(:user) # in the jam session user3 = FactoryGirl.create(:user) # not in the jam session - music_session = FactoryGirl.create(:music_session, :creator => user1, :musician_access => false) + music_session = FactoryGirl.create(:music_session, :creator => user1, :musician_access => false, :fan_access => false) FactoryGirl.create(:connection, :user => user1, :music_session => music_session) music_session.can_see?(user1).should == true diff --git a/web/app/assets/javascripts/invitationDialog.js.erb b/web/app/assets/javascripts/invitationDialog.js.erb index 9048a39e5..120bd2e3e 100644 --- a/web/app/assets/javascripts/invitationDialog.js.erb +++ b/web/app/assets/javascripts/invitationDialog.js.erb @@ -105,10 +105,11 @@ app.notifyAlert('Invalid emails', 'Please confirm email addresses'); } else { rest.createEmailInvitations(emails, $('#txt-message').val()) - .error(function() { - app.ajaxError(); + .fail(function(jqXHR) { + app.notifyServerError(jqXHR, 'Unable to Invite Users'); app.layout.closeDialog('inviteUsers'); - }).success(function() { + }) + .done(function() { app.notifyAlert('Invites sent', 'You sent '+emails.length.toString()+' email invites'); app.layout.closeDialog('inviteUsers'); });