Shore up AuthorizedFamilymember resource

See rubyforgood#226 and rubyforgood#228
mahimas28 · Oct 20, 2019 · d0a5ba9 · d0a5ba9
1 parent ebce50b
commit d0a5ba9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 31 deletions.
diff --git a/app/controllers/authorized_family_members_controller.rb b/app/controllers/authorized_family_members_controller.rb
@@ -1,42 +1,40 @@
 class AuthorizedFamilyMembersController < ApplicationController
- helper_method :authorized_family_member, :authorized_family_members, :family
-
- def new; end
+ def new
+ @authorized_family_member = family.authorized_family_members.new
+ end
 
- def show; end
+ def show
+ @authorized_family_member = current_partner.authorized_family_members.find_by(id: params[:id])
+ end
 
- def edit; end
+ def edit
+ @authorized_family_member = current_partner.authorized_family_members.find_by(id: params[:id])
+ end
 
  def create
- member = family.authorized_family_members.new(authorized_family_member_params)
- if member.save
- redirect_to member, notice: "Authorized member was successfully created."
+ @authorized_family_member = family.authorized_family_members.new(authorized_family_member_params)
+
+ if @authorized_family_member.save
+ redirect_to @authorized_family_member, notice: "Authorized member was successfully created."
  else
  render :new
  end
  end
 
  def update
- if authorized_family_member.update(authorized_family_member_params)
- redirect_to authorized_family_member, notice: "Authorized family member was successfully updated."
+ @authorized_family_member = current_partner.authorized_family_members.find_by(id: params[:id])
+
+ if @authorized_family_member.update(authorized_family_member_params)
+ redirect_to @authorized_family_member, notice: "Authorized family member was successfully updated."
  else
  render :edit
  end
  end
 
  private
 
- def authorized_family_member
- @authorized_family_member ||= current_partner.authorized_family_members.find_by(id: params[:id]) ||
- family.authorized_family_members.new
- end
-
- def authorized_family_members
- @authorized_family_members ||= current_partner.authorized_family_members.all
- end
-
  def family
- @family ||= current_partner.families.find_by(id: params[:family_id])
+ @_family ||= current_partner.families.find_by(id: params[:family_id])
  end
 
  def authorized_family_member_params
@@ -48,4 +46,4 @@ def authorized_family_member_params
  :comments
  )
  end
-end
+end
diff --git a/app/views/authorized_family_members/edit.html.erb b/app/views/authorized_family_members/edit.html.erb
@@ -8,4 +8,4 @@
  </ul>
 </div>
 
-<%= render 'form', authorized_family_member: authorized_family_member %>
+<%= render 'form', authorized_family_member: @authorized_family_member %>
diff --git a/app/views/authorized_family_members/new.html.erb b/app/views/authorized_family_members/new.html.erb
@@ -8,6 +8,6 @@
  </ul>
 </div>
 
-<%= render 'form', authorized_family_member: authorized_family_member %>
+<%= render 'form', authorized_family_member: @authorized_family_member %>
 
-<%= link_to 'Back', family_path(family) %>
+<%= link_to 'Back', family_path(@authorized_family_member.family) %>
diff --git a/app/views/authorized_family_members/show.html.erb b/app/views/authorized_family_members/show.html.erb
@@ -24,23 +24,23 @@
  <div class="card-body">
  <dl>
  <dt>First name</dt>
- <dd><%= authorized_family_member.first_name %></dd>
+ <dd><%= @authorized_family_member.first_name %></dd>
 
  <dt>Last name:</dt>
- <dd><%= authorized_family_member.last_name %></dd>
+ <dd><%= @authorized_family_member.last_name %></dd>
 
  <dt>Date of birth:</dt>
- <dd><%= authorized_family_member.date_of_birth %></dd>
+ <dd><%= @authorized_family_member.date_of_birth %></dd>
 
  <dt>Gender:</dt>
- <dd><%= authorized_family_member.gender %></dd>
+ <dd><%= @authorized_family_member.gender %></dd>
 
  <dt>Comments:</dt>
- <dd><%= authorized_family_member.comments %></dd>
+ <dd><%= @authorized_family_member.comments %></dd>
  </dl>
 
- <%= link_to 'Edit Authorized Family Member Details', edit_authorized_family_member_path(authorized_family_member), class: "btn btn-success" %>
- <%= link_to 'Show Member Family', family_path(authorized_family_member.family), class: "btn btn-info pull-right" %>
+ <%= link_to 'Edit Authorized Family Member Details', edit_authorized_family_member_path(@authorized_family_member), class: "btn btn-success" %>
+ <%= link_to 'Show Member Family', family_path(@authorized_family_member.family), class: "btn btn-info pull-right" %>
  </div>
  </div>
  </div>