fix backward compability for roles

Author: Nuo Yan

chef-server-api/app/controllers/environments.rb

@@ -99,6 +99,12 @@ def list_nodes
     node_list = Chef::Node.cdb_list_by_environment(params[:environment_id])
     display(node_list.inject({}) {|r,n| r[n] = absolute_url(:node, n); r})
   end
+  
+  # GET /environments/:environment_id/roles/:role_id
+  def role
+    
+    
+  end
 
   private
 

chef/lib/chef/role.rb

@@ -167,7 +167,8 @@ def update_from!(o)
       run_list(o.run_list)
       default_attributes(o.default_attributes)
       override_attributes(o.override_attributes)
-      env_run_lists(o.env_run_lists.merge!({"_default"=>{"default_attributes"=>o.default_attributes, "override_attributes"=>o.override_attributes, "run_list"=>o.run_list}}))
+      default_env_run_list = {"_default"=>{"default_attributes"=>o.default_attributes, "override_attributes"=>o.override_attributes, "run_list"=>o.run_list}}
+      env_run_lists(o.env_run_lists.nil? ? default_env_run_list : o.env_run_lists.merge!(default_env_run_list))
       self
     end
 
@@ -183,7 +184,8 @@ def self.json_create(o)
                     else
                       o["recipes"]
                     end)
-      role.env_run_lists(o["env_run_lists"].merge!({"_default"=>{"default_attributes"=>o["default_attributes"], "override_attributes"=>o["override_attributes"], "run_list"=>role.run_list}}))
+      default_env_run_list = {"_default"=>{"default_attributes"=>o["default_attributes"], "override_attributes"=>o["override_attributes"], "run_list"=>role.run_list}}              
+      role.env_run_lists(o["env_run_lists"].nil? ? default_env_run_list : o["env_run_lists"].merge!(default_env_run_list))
       role.couchdb_rev = o["_rev"] if o.has_key?("_rev")
       role.index_id = role.couchdb_id
       role.couchdb_id = o["_id"] if o.has_key?("_id")