Browse Source

Fix two crashes

Maarten van den Berg 7 years ago
parent
commit
053af53dfa
2 changed files with 4 additions and 5 deletions
  1. 3 4
      app/controllers/members_controller.rb
  2. 1 1
      app/views/members/show.html.erb

+ 3 - 4
app/controllers/members_controller.rb

@@ -42,9 +42,10 @@ class MembersController < ApplicationController
42 42
 
43 43
   def process_invite
44 44
     @person = Person.find_by(email: params[:person][:email])
45
+    new_rec = false
45 46
     if not @person
46 47
       @person = Person.new(invite_params)
47
-
48
+      new_rec = true
48 49
 
49 50
       if not @person.save
50 51
         respond_to do |format|
@@ -55,11 +56,9 @@ class MembersController < ApplicationController
55 56
       end
56 57
     end
57 58
 
58
-    new_rec = @member.new_record?
59 59
     @member = Member.new(person: @person, group: @group, is_leader: false)
60 60
     @member.save!
61 61
 
62
-
63 62
     respond_to do |format|
64 63
       format.html do
65 64
         invited = ""
@@ -91,7 +90,7 @@ class MembersController < ApplicationController
91 90
       if @member.save
92 91
         format.html {
93 92
           redirect_to group_member_url(@group, @member)
94
-          flash_message(:info, I18n.t('groups.member_added', name: @member.person.name))
93
+          flash_message(:info, I18n.t('groups.member_added', name: @member.person.full_name))
95 94
         }
96 95
         format.json { render :show, status: :created, location: @member }
97 96
       else

+ 1 - 1
app/views/members/show.html.erb

@@ -1,3 +1,3 @@
1
-<%= t 'groups.member.ismember', group: @group.name, member: @member.person.full_name %>
1
+<%= t 'groups.member.ismember', group: @group.name, person: @member.person.full_name %>
2 2
 <%= link_to t(:edit), edit_group_member_path(@group, @member) %> |
3 3
 <%= link_to t(:back), group_members_path(@group) %>