浏览代码

Fix two crashes

Maarten van den Berg 7 年之前
父节点
当前提交
053af53dfa
共有 2 个文件被更改,包括 4 次插入5 次删除
  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
 
42
 
43
   def process_invite
43
   def process_invite
44
     @person = Person.find_by(email: params[:person][:email])
44
     @person = Person.find_by(email: params[:person][:email])
45
+    new_rec = false
45
     if not @person
46
     if not @person
46
       @person = Person.new(invite_params)
47
       @person = Person.new(invite_params)
47
-
48
+      new_rec = true
48
 
49
 
49
       if not @person.save
50
       if not @person.save
50
         respond_to do |format|
51
         respond_to do |format|
55
       end
56
       end
56
     end
57
     end
57
 
58
 
58
-    new_rec = @member.new_record?
59
     @member = Member.new(person: @person, group: @group, is_leader: false)
59
     @member = Member.new(person: @person, group: @group, is_leader: false)
60
     @member.save!
60
     @member.save!
61
 
61
 
62
-
63
     respond_to do |format|
62
     respond_to do |format|
64
       format.html do
63
       format.html do
65
         invited = ""
64
         invited = ""
91
       if @member.save
90
       if @member.save
92
         format.html {
91
         format.html {
93
           redirect_to group_member_url(@group, @member)
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
         format.json { render :show, status: :created, location: @member }
95
         format.json { render :show, status: :created, location: @member }
97
       else
96
       else

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

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
 <%= link_to t(:edit), edit_group_member_path(@group, @member) %> |
2
 <%= link_to t(:edit), edit_group_member_path(@group, @member) %> |
3
 <%= link_to t(:back), group_members_path(@group) %>
3
 <%= link_to t(:back), group_members_path(@group) %>