From 65c87ce778c52a487d495eca5d4caa56cab58b9c Mon Sep 17 00:00:00 2001
From: Saurabh Bhatia <saurabh.a.bhatia@gmail.com>
Date: Wed, 18 Jun 2014 21:57:57 +0800
Subject: [PATCH] fixed delete in member info

---
 app/controllers/admin/member_infos_controller.rb   | 13 ++++++++++---
 app/views/admin/member_infos/_member_info.html.erb |  3 ++-
 app/views/admin/member_infos/destroy.js.erb        |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 app/views/admin/member_infos/destroy.js.erb

diff --git a/app/controllers/admin/member_infos_controller.rb b/app/controllers/admin/member_infos_controller.rb
index 6f92f20..fa083cc 100644
--- a/app/controllers/admin/member_infos_controller.rb
+++ b/app/controllers/admin/member_infos_controller.rb
@@ -21,7 +21,7 @@ class Admin::MemberInfosController < OrbitMemberController
   end
 
   def create
-  	@attribute = MemberInfo.new(info_params)
+  	@attribute = MemberInfo.new(member_info_params)
   	@attribute.save
 
   	redirect_to action: :index
@@ -38,7 +38,7 @@ class Admin::MemberInfosController < OrbitMemberController
         format.js  { render 'admin/member_infos/add_attribute_field' }
       end
     else
-  	  @attribute.update_attributes(info_params)
+  	  @attribute.update_attributes(member_info_params)
       @attribute.member_profile_fields.each{|t| t.destroy if t["to_delete"] == true}
       respond_to do |format|
         format.html { redirect_to(admin_member_infos_path) }
@@ -49,7 +49,10 @@ class Admin::MemberInfosController < OrbitMemberController
 
   def destroy
   	@attribute.destroy
-  	redirect_to action: :index
+    respond_to do |format|
+       format.html { redirect_to admin_member_infos_path }
+       format.js  { render 'admin/member_infos/destroy' }
+    end
   end
 
 private
@@ -59,6 +62,10 @@ private
     end
 
     def info_params
+      params.require(:info).permit!
+    end
+
+    def member_info_params
       params.require(:member_info).permit!
     end
 
diff --git a/app/views/admin/member_infos/_member_info.html.erb b/app/views/admin/member_infos/_member_info.html.erb
index a35fa0a..5484ee0 100644
--- a/app/views/admin/member_infos/_member_info.html.erb
+++ b/app/views/admin/member_infos/_member_info.html.erb
@@ -1,3 +1,4 @@
+              <%= Rails.logger.info"@@@@@"+attribute.inspect %>
 
       <tr>
         <td><%= attribute.key %></td>
@@ -6,7 +7,7 @@
             <div class="quick-edit">
             <ul class="nav nav-pills">
               <%= content_tag(:li, link_to(t(:add_attribute_field),edit_admin_member_info_path(attribute))) if current_user.is_admin? %>
-              <%= content_tag(:li, link_to(t(:delete_),admin_member_info_path(attribute, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"text-error", :remote => true)) if current_user.is_admin? %>
+              <%= content_tag(:li, link_to(t(:delete_),admin_member_info_path(attribute), data: { confirm: t('sure?') }, method: :delete, class: "text-error", remote: true)) if current_user.is_admin? %>
           </ul>
         </div>
         </td>
diff --git a/app/views/admin/member_infos/destroy.js.erb b/app/views/admin/member_infos/destroy.js.erb
new file mode 100644
index 0000000..11ab011
--- /dev/null
+++ b/app/views/admin/member_infos/destroy.js.erb
@@ -0,0 +1,2 @@
+$("#<%= dom_id @attribute %>").remove();
+$(window.location.replace("<%= admin_member_infos_path %>"))
\ No newline at end of file