chef-server-webui 0.9.0.a91 → 0.9.0.a92

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/app/views/nodes/_form.html.haml +2 -3
  2. data/app/views/nodes/show.html.haml +3 -3
  3. data/app/views/roles/_form.html.haml +3 -4
  4. data/app/views/roles/show.html.haml +3 -3
  5. data/lib/chef-server-webui/version.rb +1 -1
  6. metadata +3 -3
data/app/views/nodes/_form.html.haml CHANGED
@@ -23,8 +23,7 @@
23
23
  %div.sortable.run-list
24
24
  %ul#for_node.connectedSortable
25
25
  - @run_list.each do |entry|
26
- - type, name, fname = @run_list.parse_entry(entry)
27
- %li{ :id => h(fname), :class => type == 'role' ? 'ui-state-highlight' : 'ui-state-default' }= h name
26
+ %li{ :id => h(entry.to_s), :class => entry.type == 'role' ? 'ui-state-highlight' : 'ui-state-default' }= h entry.name
28
27
  %td.help
29
28
  %span.description
30
29
  Drag recipes from the list of Available Recipes section on the left, and drop them
@@ -37,7 +36,7 @@
37
36
  %div.sortable
38
37
  %ul#node_available_recipes.connectedSortable
39
38
  - @available_recipes.each do |recipe|
40
- %li{ :id => "recipe[#{recipe}]", :class => 'ui-state-default' }= h recipe
39
+ %li{ :id => "recipe[#{File.basename(recipe, ".rb")}]", :class => 'ui-state-default' }= h File.basename(recipe, ".rb")
41
40
 
42
41
 
43
42
  %div.group.form{:style => "position:relative;"}
data/app/views/nodes/show.html.haml CHANGED
@@ -24,7 +24,7 @@
24
24
  %td= run_list_item.type
25
25
  .left.accordion
26
26
  %h3.head= link_to("Recipes", "#")
27
- - full_recipe_list, default_attrs, override_attrs = @node.run_list.expand()
27
+ - recipes = @node.run_list.expand('server').recipes
28
28
  %div
29
29
  %span.description.form.help
30
30
  This is the list of recipes, fully expanded, as they will be applied to the node in question.
@@ -36,10 +36,10 @@
36
36
  %tr
37
37
  %td{:colspan => 2} This node has no recipes applied.
38
38
  - else
39
- - full_recipe_list.each_index do |i|
39
+ - full_recipe_list.each do |recipe|
40
40
  %tr
41
41
  %td.position= i
42
- %td= full_recipe_list[i]
42
+ %td= recipe
43
43
 
44
44
  .left
45
45
  %h3 Tags
data/app/views/roles/_form.html.haml CHANGED
@@ -16,7 +16,7 @@
16
16
  %td
17
17
  %label.label Available Roles
18
18
  %td
19
- %label.label Run List
19
+ %label.label Run List
20
20
  %tr
21
21
  %td
22
22
  %div.sortable
@@ -27,8 +27,7 @@
27
27
  %div.sortable.run-list
28
28
  %ul#for_role.connectedSortable
29
29
  - @run_list.each do |entry|
30
- - type, name, fname = @run_list.parse_entry(entry)
31
- %li{ :id => h(fname), :class => type == 'role' ? 'ui-state-highlight' : 'ui-state-default' }= h name
30
+ %li{ :id => h(entry.to_s), :class => entry.type == 'role' ? 'ui-state-highlight' : 'ui-state-default' }= h entry.name
32
31
  %td.help
33
32
  %span.description
34
33
  Drag recipes from the list of Available Recipes section on the left, and drop them
@@ -41,7 +40,7 @@
41
40
  %div.sortable
42
41
  %ul#node_available_recipes.connectedSortable
43
42
  - @available_recipes.each do |recipe|
44
- %li{ :id => "recipe[#{recipe}]", :class => 'ui-state-default' }= h recipe
43
+ %li{ :id => "recipe[#{File.basename(recipe, ".rb")}]", :class => 'ui-state-default' }= h File.basename(recipe, ".rb")
45
44
 
46
45
  %div.group.form{:style => "position:relative;"}
47
46
  %label.label Default and Override Attributes
data/app/views/roles/show.html.haml CHANGED
@@ -27,7 +27,7 @@
27
27
  %td= run_list_item.type
28
28
  .left.accordion
29
29
  %h3.head= link_to("Recipes", "#")
30
- - full_recipe_list, default_attrs, override_attrs = @role.run_list.expand()
30
+ - recipes = @role.run_list.expand('server').recipes
31
31
  %div
32
32
  %span.description.form.help
33
33
  This is the list of recipes, fully expanded, as they will be applied to the node in question.
@@ -39,10 +39,10 @@
39
39
  %tr
40
40
  %td{:colspan => 2} This node has no recipes applied.
41
41
  - else
42
- - full_recipe_list.each_index do |i|
42
+ - recipes.each do |recipe|
43
43
  %tr
44
44
  %td.position= i
45
- %td= full_recipe_list[i]
45
+ %td= recipes
46
46
  .left
47
47
  %h3 Default Attributes
48
48
  = build_tree('defattrs', @role.default_attributes)
data/lib/chef-server-webui/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ChefServerWebui
2
- VERSION = '0.9.0.a91'
2
+ VERSION = '0.9.0.a92'
3
3
  end
metadata CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 0
7
7
  - 9
8
8
  - 0
9
- - a91
10
- version: 0.9.0.a91
9
+ - a92
10
+ version: 0.9.0.a92
11
11
  platform: ruby
12
12
  authors:
13
13
  - Opscode
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-06-08 00:00:00 -07:00
18
+ date: 2010-06-11 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency