Skip to content

Commit 0f3ba8e

Browse files
just3wsjust3ws
committed
WIP: Working through broken references to new models
1 parent f1ba778 commit 0f3ba8e

20 files changed

+121
-108
lines changed

‎Gemfile.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
GIT
2-
remote: https://github.com/rebelidealist/stripe-ruby-mock
3-
revision: f4229cbe762bc2a5a302cdd83088c283881e9c5a
4-
branch: live-tests
2+
remote: git://github.com/emberjs/ember-rails.git
3+
revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
54
specs:
6-
stripe-ruby-mock (1.10.1.7)
7-
dante (>= 0.2.0)
8-
jimson-temp
9-
stripe (>= 1.15.0)
5+
ember-rails (0.15.0)
6+
active_model_serializers
7+
barber (>= 0.4.1)
8+
ember-data-source (>= 1.0.0.beta.5)
9+
ember-source (>= 1.1.0)
10+
execjs (>= 1.2)
11+
handlebars-source (> 1.0.0)
12+
jquery-rails (>= 1.0.17)
13+
railties (>= 3.1)
1014

1115
GIT
1216
remote: git://github.com/nixme/jazz_hands.git
@@ -35,18 +39,14 @@ GIT
3539
rest-client (~> 1.4)
3640

3741
GIT
38-
remote: git://github.com/emberjs/ember-rails.git
39-
revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
42+
remote: https://github.com/rebelidealist/stripe-ruby-mock
43+
revision: f4229cbe762bc2a5a302cdd83088c283881e9c5a
44+
branch: live-tests
4045
specs:
41-
ember-rails (0.15.0)
42-
active_model_serializers
43-
barber (>= 0.4.1)
44-
ember-data-source (>= 1.0.0.beta.5)
45-
ember-source (>= 1.1.0)
46-
execjs (>= 1.2)
47-
handlebars-source (> 1.0.0)
48-
jquery-rails (>= 1.0.17)
49-
railties (>= 3.1)
46+
stripe-ruby-mock (1.10.1.7)
47+
dante (>= 0.2.0)
48+
jimson-temp
49+
stripe (>= 1.15.0)
5050

5151
GEM
5252
remote: https://rubygems.org/

‎app/controllers/accounts_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def create
2222

2323
if @account.save_with_payment(@plan)
2424
unless @team.is_member?(current_user)
25-
@team.add_user(current_user)
25+
@team.add_member(current_user)
2626
@team.save
2727
end
2828
record_event('upgraded team')

‎app/controllers/team_members_controller.rb renamed to ‎app/controllers/members_controller.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
class TeamMembersController < ApplicationController
1+
class MembersController < ApplicationController
22

33
def destroy
44
@user = User.find(params[:id])
55
return head(:forbidden) unless signed_in? && (team.admin?(current_user) || current_user == @user)
6-
team.remove_user(@user)
6+
team.remove_member(@user)
77
record_event("removed team") if !Team.where(id: team.id.to_s).exists?
88

99
if @user == current_user
@@ -20,6 +20,7 @@ def destroy
2020
end
2121

2222
private
23+
2324
def team
2425
@team ||= Team.find(params[:team_id])
2526
end
@@ -30,4 +31,4 @@ def is_email_address?(value)
3031
t = m.__send__(:tree)
3132
r &&= (t.domain.dot_atom_text.elements.size > 1)
3233
end
33-
end
34+
end

‎app/controllers/teams_controller.rb

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def create
9090
@teams = Team.where('name ilike ?', "#{@team}%").limit(3) unless confirmed
9191

9292
if @team.valid? and @teams.blank? and @team.new_record?
93-
@team.add_user(current_user)
93+
@team.add_member(current_user)
9494
# @team.edited_by(current_user)
9595
@team.save
9696
record_event('created team')
@@ -142,12 +142,17 @@ def update
142142
end
143143

144144
def follow
145+
146+
require 'pry'; binding.pry
147+
148+
145149
# TODO move to concern
146-
if params[:id] =~ /^[0-9A-F]{24}$/i
147-
@team = Team.find(params[:id])
148-
else
149-
@team = Team.where(slug: params[:id]).first
150-
end
150+
@team = if params[:id].present? && (params[:id].to_i rescue nil)
151+
Team.find(params[:id].to_i)
152+
else
153+
Team.where(slug: params[:id]).first
154+
end
155+
151156
if current_user.following_team?(@team)
152157
current_user.unfollow_team!(@team)
153158
else
@@ -188,7 +193,7 @@ def accept
188193

189194
@team = Team.find(accept_params[:id])
190195
if accept_params[:r] && @team.has_user_with_referral_token?(accept_params[:r])
191-
@team.add_user(current_user)
196+
@team.add_member(current_user)
192197
current_user.update_attribute(:referred_by, accept_params[:r]) if current_user.referred_by.nil?
193198
flash[:notice] = "Welcome to team #{@team.name}"
194199
record_event("accepted team invite")

‎app/helpers/premium_helper.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ def job_visited(job)
223223
visit_team_opportunity_path(job.team_id, job.id) unless job.new_record?
224224
end
225225

226-
def link_to_add_fields(name, f, association)
227-
new_object = f.object.class.reflect_on_association(association).klass.new
228-
fields = f.fields_for(association, new_object, child_index: "new_#{association}") do |builder|
226+
def link_to_add_fields(name, form, association)
227+
new_object = form.object.class.reflect_on_association(association).klass.new
228+
fields = form.fields_for(association, new_object, child_index: "new_#{association}") do |builder|
229229
render(association.to_s.singularize + "_fields", f: builder)
230230
end
231231
link_to_function(name, "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")")

‎app/models/team.rb

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -434,15 +434,20 @@ def sorted_team_members
434434
@sorted_team_members = members.order('score_cache DESC')
435435
end
436436

437-
def add_user(user)
438-
members << user
439-
save!
437+
def add_member(user)
438+
require 'pry'; binding.pry
440439

441-
user
440+
return member if member = members.select { |m| m.user_id == user.id }
441+
member = members.create(user_id: user.id)
442+
save!
443+
member
442444
end
443445

444-
def remove_user(user)
445-
members.destroy(user)
446+
def remove_member(user)
447+
require 'pry'; binding.pry
448+
449+
return nil unless member = members.select { |m| m.user_id == user.id }
450+
members.destroy(member)
446451
save!
447452
end
448453

@@ -796,7 +801,7 @@ def request_to_join(user)
796801
end
797802

798803
def approve_join_request(user)
799-
self.add_user(user)
804+
self.add_member(user)
800805
self.pending_join_requests.delete user.id
801806
end
802807

@@ -805,6 +810,7 @@ def deny_join_request(user)
805810
end
806811

807812
private
813+
808814
def identify_visitor(visitor_name)
809815
visitor_id = visitor_name.to_i
810816
if visitor_id != 0 and visitor_name =~ /^[0-9]+$/i

‎app/models/teams/member.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def display_name
3030
name
3131
about
3232
team_responsibilities
33+
speciality_tags
3334
).each do |user_method|
3435
delegate user_method, to: :user
3536
end

‎app/views/team_members/_team_member.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%li.team_member
22
=avatar_image_tag(team_member)
33
%h3=team_member.display_name
4-
= form_tag team_team_member_path(@team, team_member), :method => :delete do
4+
= form_tag team_members_path(@team, team_member), :method => :delete do
55
%input.button.cancel.track{:type => "submit", :value => "Remove", 'data-action' => 'leave team', 'data-from' => 'team member remove'}
6-
.clear
6+
.clear

‎app/views/teams/_location_fields.html.haml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
%fieldset
2+
= f.label :name, 'Location Name'
3+
= f.text_field :name
4+
%fieldset
5+
= f.label :description, 'Highlights for this office location'
6+
= f.text_area :description
7+
%fieldset
8+
= f.label :address, 'Full address of this office location'
9+
= f.text_field :address
10+
%fieldset
11+
= f.label :_destroy, "Remove Location"
12+
= f.check_box :_destroy

‎app/views/teams/_locations.html.haml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
%section.location#locations{:class => section_enabled_class(@team.has_locations?)}
2-
-if !@team.has_locations?
3-
-inactive_box('#locations', "Office Locations") do
4-
=nil
2+
- if !@team.has_locations?
3+
- inactive_box('#locations', "Office Locations") do
4+
= nil
55

6-
-if can_edit?
7-
-panel_form_for_section('#locations', 'Where do you have offices?') do |f|
6+
- if can_edit?
7+
- panel_form_for_section('#locations', 'Where do you have offices?') do |f|
88
%aside
9-
-admin_hint do
9+
- admin_hint do
1010
Specify points of interest (e.g. restaurants, bars, public transportation) and other amenities and highlights for each office location
1111
.form-inputs
1212
%fieldset
13-
.add-map-location=link_to_add_fields('Add new location', f, :team_locations)
13+
.add-map-location= link_to_add_fields('Add new location', f, :locations)
1414
-if @team.has_locations?
1515
.location-list
16-
=f.fields_for :team_locations do |fields|
16+
= f.fields_for :team_locations do |fields|
1717
.item
18-
=fields.hidden_field :id
18+
= fields.hidden_field :id
1919
%fieldset
20-
=fields.label :name, 'Location Name'
21-
=fields.text_field :name
20+
= fields.label :name, 'Location Name'
21+
= fields.text_field :name
2222
%fieldset
23-
=fields.label :description, 'Highlights for this office location'
24-
=fields.text_area :description
23+
= fields.label :description, 'Highlights for this office location'
24+
= fields.text_area :description
2525
%fieldset
26-
=fields.label :address, 'Full street address of this office location'
27-
=fields.text_field :address
26+
= fields.label :address, 'Full street address of this office location'
27+
= fields.text_field :address
2828
%fieldset.remove-location
29-
=fields.label :_destroy, "Remove Location"
30-
=fields.check_box :_destroy
29+
= fields.label :_destroy, "Remove Location"
30+
= fields.check_box :_destroy
3131

3232
#location-map
3333
.location-details
3434
.selected
35-
%h3=@team.primary_address_name
36-
%p.address=@team.primary_address
37-
%p.description=@team.primary_address_description
35+
%h3= @team.primary_address_name
36+
%p.address= @team.primary_address
37+
%p.description= @team.primary_address_description
3838
%ul.poi
39-
-@team.primary_points_of_interest.each do |point|
40-
%li=point
39+
- @team.primary_points_of_interest.each do |point|
40+
%li= point
4141
-if @team.locations.size > 1
4242
%ul.locations.cf
43-
-@team.locations.each do |location|
43+
- @team.locations.each do |location|
4444
%li.team_location
4545
%a.mapLocation{:href => '#position'}
46-
.name=location.name
47-
.address.hide=location.address || location.name
48-
.description.hide=location.description
46+
.name= location.name
47+
.address.hide= location.address || location.name
48+
.description.hide= location.description
4949
%ul.poi
50-
-location.points_of_interest.each do |point|
51-
%li=point
50+
- location.points_of_interest.each do |point|
51+
%li= point

‎app/views/teams/_team_location_fields.html.haml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/views/teams/_team_members.html.haml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
.filler
1313
%fieldset
1414
%ul.members-admin
15-
-@team.sorted_team_members.each do |member|
16-
%li{:id => dom_id(member)}
15+
- @team.sorted_team_members.each do |member|
16+
%li{ :id => dom_id(member) }
1717
%p
18-
=member.display_name
18+
= member.display_name
1919
%div
2020
%ul
2121
%li
22-
=link_to('edit bio', edit_user_path(member), :target => :new)
22+
= link_to('edit bio', edit_user_path(member), :target => :new)
2323
%li
24-
=form_tag team_team_member_path(@team, member), :method => :delete, :remote => true do
25-
=submit_tag "Remove", :class => 'leave button', :remote => true, :confirm => 'Are you sure?'
24+
= form_tag team_members_path(@team, member), :method => :delete, :remote => true do
25+
= submit_tag 'Remove', :class => 'leave button', :remote => true, :confirm => 'Are you sure?'
2626

27-
=users_image_tag(member)
27+
= users_image_tag(member)
2828

2929

3030

‎app/views/teams/show.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
%li
3232
=link_to('Edit Team', edit_team_path(@team), :class => 'edit')
3333
%li
34-
=form_tag team_team_member_path(@team, current_user), :method => :delete do
34+
=form_tag team_members_path(@team, current_user), :method => :delete do
3535
%input.button.cancel.track{:type => "submit", :value => "Leave Team", :class => 'leave'}
3636

3737
=follow_team_link(@team)

‎app/views/users/show.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
%span.team-avatar=image_tag(@user.team.avatar_url, :width => 22, :height => 22)
149149
%div{:itemprop => :affiliation}=truncate("#{@user.team.name}", :length => 28)
150150
-if viewing_self?
151-
= link_to 'Leave team', team_members_path([@user.team, @user]), :method => :delete, :confirm => "Are you sure you want to leave team #{@user.team.name}", :class => "leave-team track", 'data-action' => 'leave team', 'data-from' => 'profile page'
151+
= link_to 'Leave team', team_member_path(@user.team, @user), :method => :delete, :confirm => "Are you sure you want to leave team #{@user.team.name}", :class => "leave-team track", 'data-action' => 'leave team', 'data-from' => 'profile page'
152152

153153
-elsif viewing_self?
154154
%li.team-self

‎db/seeds.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ def self.create_network_for(name)
135135

136136
team_name = 'Put a Bird on It'
137137
paboi = Team.where(name: team_name).try(:first) || Team.create!(name: team_name)
138-
paboi.add_user(lisa)
139-
paboi.add_user(bryce)
138+
paboi.add_member(lisa)
139+
paboi.add_member(bryce)
140140

141141
paboi.benefit_name_1 = 'Putting birds on things.'
142142
paboi.big_quote = 'The dream of the 90s is alive in Portland!'

‎spec/controllers/accounts_controller_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
let(:current_user) { Fabricate(:user) }
55

66
before do
7-
team.add_user(current_user)
7+
team.add_member(current_user)
88
controller.send :sign_in, current_user
99
end
1010

0 commit comments

Comments
 (0)