From e94ee50674889312865f8489f767f6d046197ae0 Mon Sep 17 00:00:00 2001
From: Saurabh Bhatia <saurabh.a.bhatia@gmail.com>
Date: Fri, 11 Jul 2014 12:17:43 +0800
Subject: [PATCH] Fix role status issue

---
 app/assets/javascripts/lib/member/role-forms.js | 6 +++++-
 app/controllers/admin/members_controller.rb     | 3 +++
 app/views/admin/members/_role.html.erb          | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/lib/member/role-forms.js b/app/assets/javascripts/lib/member/role-forms.js
index 455cd6d..7ad84c3 100644
--- a/app/assets/javascripts/lib/member/role-forms.js
+++ b/app/assets/javascripts/lib/member/role-forms.js
@@ -223,6 +223,7 @@ $(function() {
 		});
 		$('#user-forms').delegate('.togglebox, .delete, .trigger, .remove-input', clickEvent, function(event) {
 			if($(this).hasClass('togglebox')) {
+				var role_staus = [];
 				if($(this).hasClass('disable')) {
 					$(this).find('.toggle-check')
 						   .attr('value', 'false')
@@ -236,7 +237,10 @@ $(function() {
 						   .closest('.attributes')
 						   .addClass('disabled')
 						   .children('.attributes-body')
-						   .fadeOut(300);
+						   .fadeOut(300)
+						   .find('.check')
+						   .attr("checked",false)
+						   .attr("value",role_staus);
 				}
 				$(this).toggleClass('disable');
 			};
diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index e026f1e..93f0e04 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -144,6 +144,9 @@ class Admin::MembersController < OrbitMemberController
           @user.save
           @user.update_attributes(member_profile_id: @member.id)
         end
+        if params[:member_profile][:role_status_ids].nil?
+          @member.update_attributes(role_status_ids: [])
+        end
         if !params[:member_profile_field_values].nil?
           params[:member_profile_field_values].each_with_index do |m,i|
             field_value = m.last[:id].present?
diff --git a/app/views/admin/members/_role.html.erb b/app/views/admin/members/_role.html.erb
index af06e0c..cd493a2 100644
--- a/app/views/admin/members/_role.html.erb
+++ b/app/views/admin/members/_role.html.erb
@@ -1,7 +1,7 @@
 <% role_disable = @member.roles.include?(role) ?   false : true    %> 
   <div class="attributes <%= role_disable ? 'disabled' : '' %>">
   <div class="attributes-header clearfix">
-    <%= hidden_field_tag("member_profile[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable)%>
+    <%= hidden_field_tag("member_profile[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable) %>
     <h4><%= role.title %><%= t(:role_info)%></h4>
   </div>
 
@@ -14,7 +14,7 @@
         <div class="controls">
         <% role.role_statuses.where(disable: false).each_with_index  do |rrs, i| %>
           <label class="checkbox inline">
-            <%= check_box_tag 'member_profile[role_status_ids][]', rrs.id, @member.role_statuses.include?(rrs) ? true: false %> <%= rrs.title %>
+            <%= check_box_tag 'member_profile[role_status_ids][]', rrs.id, @member.role_statuses.include?(rrs) ? true: false, class: "check" %> <%= rrs.title %>
           </label>
         <% end %>