update update_role method

the-teacher · Apr 4, 2012 · 90755ca · 90755ca
1 parent 9bc207e
commit 90755ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
@@ -14,7 +14,9 @@ def new
     @role = Role.new
   end
 
-  def edit; end
+  def edit
+    #render :text => @role.to_hash and return
+  end
 
   def create
     @role = Role.new(params[:role])
@@ -28,7 +30,7 @@ def create
   end
 
   def update
-    if @role.update_role params[:role][:the_role]
+    if @role.update_role params[:role].try(:[],:the_role)
       flash[:notice] = t('the_role.role_updated')
       redirect_to edit_admin_role_path(@role)
     else

diff --git a/app/views/admin/roles/edit.html.haml b/app/views/admin/roles/edit.html.haml
@@ -6,6 +6,8 @@
   = stylesheet_link_tag   'the_role/headers'
   = stylesheet_link_tag   'the_role/form'
 
+= new_section_admin_role_path(@role)
+
 .the_role
   %p= flash[:notice]
 

diff --git a/lib/the_role/modules/role_model.rb b/lib/the_role/modules/role_model.rb
@@ -62,9 +62,9 @@ def to_s
         # all keys will become symbols
         # look at lib/the_role/hash.rb to find definition of *underscorify_keys* method
         def update_role new_role_hash
-          return true unless new_role_hash.instance_of? Hash
-          new_role    = new_role_hash.underscorify_keys
-          role        = to_hash.underscorify_keys.deep_reset
+          new_role_hash = new_role_hash.try(:to_hash) || {}
+          new_role      = new_role_hash.underscorify_keys
+          role          = to_hash.underscorify_keys.deep_reset
           role.deep_merge! new_role
           update_attributes(:the_role => role.to_yaml)
         end