app/views/roles/_form.html.haml in chef-server-webui-0.9.0.a91 vs app/views/roles/_form.html.haml in chef-server-webui-0.9.0.a92
- old
+ new
@@ -14,23 +14,22 @@
%table.sortable
%tr
%td
%label.label Available Roles
%td
- %label.label Run List
+ %label.label Run List
%tr
%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
- @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
+ %li{ :id => h(entry.to_s), :class => entry.type == 'role' ? 'ui-state-highlight' : 'ui-state-default' }= h entry.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 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
@@ -39,10 +38,10 @@
%tr
%td
%div.sortable
%ul#node_available_recipes.connectedSortable
- @available_recipes.each do |recipe|
- %li{ :id => "recipe[#{recipe}]", :class => 'ui-state-default' }= h recipe
+ %li{ :id => "recipe[#{File.basename(recipe, ".rb")}]", :class => 'ui-state-default' }= h File.basename(recipe, ".rb")
%div.group.form{:style => "position:relative;"}
%label.label Default and Override Attributes
= partial 'layout/jsonedit', :json => { :defaults => @role.default_attributes, :overrides => @role.override_attributes }.to_json
%span.description A JSON hash for default attributes for nodes of this role. These attributes will only be applied if the node does not already have a value for the attributes.