diff options
| author | Seth Chisamore <schisamo@opscode.com> | 2012-08-07 22:32:38 -0400 |
|---|---|---|
| committer | Seth Chisamore <schisamo@opscode.com> | 2012-08-07 22:32:38 -0400 |
| commit | 70cd65b50e175e27b7b7d7b6c332fef737c5b565 (patch) | |
| tree | 0c71a0b6cbffbb50f11b8694f639e68ecab01dd8 | |
| parent | e87e96e9ec43cf3a9865349e99f75a820c344410 (diff) | |
| download | chef-omnibus-chef-fixes.tar.gz | |
Use the built in Rails path helpersomnibus-chef-fixes
`url()` helper is a leftover vestige from Merb.
| -rw-r--r-- | chef-server-webui/app/views/nodes/index.html.haml | 2 | ||||
| -rw-r--r-- | chef-server-webui/app/views/status/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chef-server-webui/app/views/nodes/index.html.haml b/chef-server-webui/app/views/nodes/index.html.haml index e950d38233..9c8369950d 100644 --- a/chef-server-webui/app/views/nodes/index.html.haml +++ b/chef-server-webui/app/views/nodes/index.html.haml @@ -16,7 +16,7 @@ - if session[:environment] %td{:colspan => 4}= "The environment #{session[:environment]} has no nodes" - else - %td{:colspan => 4}= "You have no nodes - try connecting one, or creating or editing a #{link_to('node', url(:nodes))}" + %td{:colspan => 4}= "You have no nodes - try connecting one, or creating or editing a #{link_to('node', nodes_path)}".html_safe - else - @node_list.sort_by {|value| value.downcase}.each do |node| %tr{:class => even ? "even": "odd" } diff --git a/chef-server-webui/app/views/status/index.html.haml b/chef-server-webui/app/views/status/index.html.haml index d641e87ff5..58c8f0f79c 100644 --- a/chef-server-webui/app/views/status/index.html.haml +++ b/chef-server-webui/app/views/status/index.html.haml @@ -19,7 +19,7 @@ - else - @status.sort.each_with_index do |node, index| %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"} - %td= link_to(node[1].name, url(:node, node[1].name)) + %td= link_to(node[1].name, node_path(node[1].name)) %td= "#{node[1]["platform"]} #{node[1]["platform_version"]}" %td= node[1]["fqdn"] %td= node[1]["ipaddress"] |