Skip to content

Commit cf3d74d

Browse files
committed
Existing users will get added to a startup immediately. See fredwu#7.
1 parent 5be56ec commit cf3d74d

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

app/assets/javascripts/concerns/editable.js.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ jQuery ->
111111
$('.inline_edtiable_container').delegate('form', 'submit', ->
112112
return true if $(@).parents('.follow_button').length > 0
113113

114-
inline_popup = $(@).parent().hasClass('inline_popup')
115114
edit_target = $(@).parent().parent()
115+
inline_popup = $(@).parent().hasClass('inline_popup') or edit_target.hasClass('inline_popup')
116116
target_link = edit_target.data('target_link')
117117

118118
$(@).ajaxSubmit(

app/models/startup.rb

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ def invite_or_attach_user(role_identifier, attributes)
7070
user = User.find_by_email(attributes[:email]) || attributes[:email] # && TODO: send an invitation email
7171

7272
attach_user(user, role_identifier, attributes[:member_title])
73+
74+
# TODO: remove the confirmation and make the target user to confirm the invite manually
75+
confirm_user(user, role_identifier)
7376
end
7477

7578
def attach_user(user, role_identifier = :member, member_title = '')

app/views/startups/_profile_team.html.slim

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.team
2-
h2= t('label.members')
3-
= render 'startups/add_user_link', :startup => startup, :role_identifier => 'member'
4-
= render 'users/index', :collection => startup.members, :meta => { :removable => true, :editable => true, :parent => startup, :role_identifier => 'member' }
5-
.clear
1+
.team.inline_popup data-target_link="#{startup_profile_team_path(startup)}" data-edit_target="#profile_team"
2+
h2= t('label.members')
3+
= render 'startups/add_user_link', :startup => startup, :role_identifier => 'member'
4+
= render 'users/index', :collection => startup.members, :meta => { :removable => true, :editable => true, :parent => startup, :role_identifier => 'member' }
5+
.clear
66

77
.team
88
h2= t('label.investors')

spec/models/startup_spec.rb

+8
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,14 @@
174174
subject.member_title(user).should == 'CEO'
175175
subject.user_role(user).should == 'Member'
176176
end
177+
178+
it "invites the user" do
179+
user = User.make!(:email => '[email protected]')
180+
subject.invite_or_attach_user(:member, { :email => '[email protected]' })
181+
182+
subject.members.last.should == user
183+
subject.user_meta(user).confirmed.should == true
184+
end
177185
end
178186

179187
describe "logo" do

0 commit comments

Comments
 (0)