Merge branch 'CHEF-505' of git://github.com/me/chef into me/CHEF-505

Author: adamhjk

chef-server-webui/app/controllers/roles.rb

@@ -44,7 +44,8 @@ def show
   def new
     @available_recipes = get_available_recipes 
     @role = Chef::Role.new
-    @current_recipes = @role.recipes
+    @available_roles = Chef::Role.list.keys.sort
+    @run_list = @role.run_list
     render
   end
 
@@ -56,7 +57,8 @@ def edit
       raise NotFound, "Cannot load role #{params[:id]}"
     end
     @available_recipes = get_available_recipes 
-    @current_recipes = @role.recipes
+    @available_roles = Chef::Role.list.keys.sort
+    @run_list = @role.run_list
     render 
   end
 
@@ -65,7 +67,7 @@ def create
     begin
       @role = Chef::Role.new
       @role.name(params[:name])
-      @role.recipes(params[:for_role] ? params[:for_role] : [])
+      @role.run_list(params[:for_role] ? params[:for_role] : [])
       @role.description(params[:description]) if params[:description] != ''
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(JSON.parse(params[:override_attributes])) if params[:override_attributes] != ''
@@ -84,7 +86,7 @@ def create
       @role = Chef::Role.new
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(JSON.parse(params[:override_attributes])) if params[:override_attributes] != ''
-      @current_recipes = params[:for_role] ? params[:for_role] : []
+      @run_list = params[:for_role] ? params[:for_role] : []
       @_message = { :error => $! }
       render :new
     end
@@ -99,7 +101,7 @@ def update
     end
 
     begin
-      @role.recipes(params[:for_role] ? params[:for_role] : [])
+      @role.run_list(params[:for_role] ? params[:for_role] : [])
       @role.description(params[:description]) if params[:description] != ''
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(JSON.parse(params[:override_attributes])) if params[:override_attributes] != ''
@@ -108,7 +110,7 @@ def update
       render :show
     rescue ArgumentError
       @available_recipes = get_available_recipes 
-      @current_recipes = params[:for_role] ? params[:for_role] : []
+      @run_list = params[:for_role] ? params[:for_role] : []
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(JSON.parse(params[:override_attributes])) if params[:override_attributes] != ''
       render :edit

chef-server-webui/app/views/roles/_form.html.haml

@@ -14,25 +14,34 @@
       %table.sortable
         %tr
           %td 
-            %label.label Available Recipes
+            %label.label Available Roles
           %td
-            %label.label Recipes for this Role 
+            %label.label Run List 
         %tr
           %td
             %div.sortable
-              %ul#available_recipes.connectedSortable
-                - @available_recipes.each do |recipe|
-                  %li{ :id => h(recipe), :class => 'ui-state-highlight' }= h recipe 
-          %td
-            %div.sortable
+              %ul#node_available_roles.connectedSortable
+                - @available_roles.each do |role|
+                  %li{ :id => "role[#{role}]", :class => 'ui-state-highlight' }= h role 
+          %td{:rowspan => 3}
+            %div.sortable.run-list
               %ul#for_role.connectedSortable
-                - @current_recipes.each do |recipe|
-                  %li{ :id => h(recipe), :class => 'ui-state-highlight' }= h recipe 
-
+                - @run_list.each do |entry|
+                  - type, name, fname = @run_list.parse_entry(entry)
+                  %li{ :id => h(fname), :class => type == 'role' ? 'ui-state-highlight' : 'ui-state-default' }= h name 
           %td.help
             %span.description
               Drag recipes from the list of Available Recipes section on the left, and drop them
-              in the "Recipes for this Role" section on the right.  Then sort the recipes for this role list to the order you would like to see the recipes applied.
+              in the "Recipes for this node" section on the right.  Then sort the recipes for this node list to the order you would like to see the recipes applied.
+        %tr
+          %td
+            %label.label Available Recipes
+        %tr
+          %td
+            %div.sortable
+              %ul#node_available_recipes.connectedSortable
+                - @available_recipes.each do |recipe|
+                  %li{ :id => "recipe[#{recipe}]", :class => 'ui-state-default' }= h recipe
 
     %div.group.form{:style => "position:relative;"}
       %label.label Default and Override Attributes 

chef-server-webui/app/views/roles/show.html.haml

@@ -9,16 +9,41 @@
             %h3 Description
             = @role.description
 
-          .left 
-            %h3 Recipes
-            %table#recipes.table
+          .left
+            %h3 Run List
+            %table.table
               %tr
                 %th.first Position
-                %th.last Name
-              - @role.recipes.each_index do |i|
+                %th Name
+                %th.last Type
+                - if @role.run_list.empty?
+                  %tr
+                    %td{:colspan => 2} This role does not include any roles or recipes.
+                - else
+                  -@role.run_list.each_index do |i|
+                    - type, name, fname = @role.run_list.parse_entry(@role.run_list[i])
+                    %tr
+                      %td.position= i
+                      %td= name 
+                      %td= type 
+          .left.accordion
+            %h3.head= link_to("Recipes", "#")
+            - full_recipe_list, default_attrs, override_attrs = @role.run_list.expand()
+            %div
+              %span.description.form.help
+                This is the list of recipes, fully expanded, as they will be applied to the node in question.  
+              %table#recipes.table
                 %tr
-                  %td.position= i
-                  %td= @role.recipes[i]
+                  %th.first Position
+                  %th.last Name
+                - if @role.run_list.empty?
+                  %tr
+                    %td{:colspan => 2} This node has no recipes applied.
+                - else
+                  - full_recipe_list.each_index do |i|
+                    %tr
+                      %td.position= i
+                      %td= full_recipe_list[i]
           .left 
             %h3 Default Attributes
             = build_tree('defattrs', @role.default_attributes)