member role edit

app/models/user/attribute.rb

@@ -6,7 +6,9 @@ class Attribute
   field :key
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
-  field :title, localize: true
+  field :title, localize: true  
+  
+  field :to_search, :type => Boolean, :default => false
   
   has_many :attribute_fields, :autosave => true, :dependent => :destroy
   accepts_nested_attributes_for :attribute_fields, :allow_destroy => true

app/models/user/role.rb

@@ -7,8 +7,6 @@ class Role < Attribute
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
   
-  field :to_search, :type => Boolean, :default => false
-  
   field :title, localize: true
   
   has_many :sub_roles, :autosave => true, :dependent => :destroy

app/models/user/user.rb

@@ -72,14 +72,32 @@ class User
     sub_roles.where(role_id: role.id)
   end
 
-  def disable_sub_role=(var)
+  def disable_role=(var)
     var[:id].each do |id,val|  
       # binding.pry if id == '5052c5b22b5c49ab02000004'
       if (val=="true")
+        self.roles = self.roles.reject{|t| t.id.to_s==id}
+      elsif(val=="false")
+        self.roles << Role.find(id)
+      end
+    end
+  end
+
+  def disable_sub_role=(var)
+    var[:id].each do |id,val|  
+	
+	  @sr = SubRole.find(id)
+	  
+	  @roid = Role.find(@sr.role_id.to_s)
+	  
+      # binding.pry if id == '5052c5b22b5c49ab02000004'
+	  
+      if ( self.roles.include?(@roid) == false or val=="true")
         self.sub_roles = self.sub_roles.reject{|t| t.id.to_s==id}
       elsif(val=="false")
         self.sub_roles << SubRole.find(id)
       end
+	  
     end
   end
 
@@ -189,7 +207,8 @@ class User
   
   protected
     def save_roles
-      self.roles = self.sub_roles.collect{|t| t.role}.uniq
+      # self.roles = self.sub_roles.collect{|t| t.role}.uniq
+      self.roles = self.roles.uniq
     end