Updated check for an empty run list to use recipes instead of the une…

…xpanded run list. Also fixing some typos on the show role tab that talked about nodes where it really meant role.
jarlebh · Jul 19, 2011 · 118f1d8 · 118f1d8
1 parent 7369d46
commit 118f1d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/chef-server-webui/app/views/nodes/show.html.haml b/chef-server-webui/app/views/nodes/show.html.haml
@@ -37,7 +37,7 @@
                 %tr
                   %th.first Position
                   %th.last Name
-                - if @node.run_list.empty?
+                - if recipes.empty?
                   %tr
                     %td{:colspan => 2} This node has no recipes applied.
                 - else

diff --git a/chef-server-webui/app/views/roles/show.html.haml b/chef-server-webui/app/views/roles/show.html.haml
@@ -33,14 +33,14 @@
             %h3.head= link_to("Recipes", "#")
             %div
               %span.description.form.help
-                This is the list of recipes, fully expanded, as they will be applied to the node in question.  
+                This is the list of recipes, fully expanded, as they will be applied by the role in question.  
               %table#recipes.table
                 %tr
                   %th.first Position
                   %th.last Name
                 - if @run_list.empty?
                   %tr
-                    %td{:colspan => 2} This node has no recipes applied.
+                    %td{:colspan => 2} This role applies no recipes.
                 - else
                   - @recipes.each_with_index do |recipe, i|
                     %tr