Skip to content

Commit 4f3b59e

Browse files
IvanAJ Christensen
authored andcommitted
CHEF-777: added missing scope.resources for clients
refactor determine_name to not kludge node names
1 parent 4b9f2d4 commit 4f3b59e

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

chef-server-webui/app/helpers/application_helper.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,12 @@ def str_to_bool(str)
133133

134134
#for showing search result
135135
def determine_name(type, object)
136-
if type == :node
137-
object.name.gsub(/\./, '_')
138-
elsif type == :role
136+
case type
137+
when :node, :role
139138
object.name
140139
else
141-
params[:id]
142-
end
140+
params[:id]
141+
end
143142
end
144143

145144
def get_databag_item_name(uri)

chef-server-webui/lib/chef-server-webui.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ def self.deactivate
6666
def self.setup_router(scope)
6767

6868
scope.resources :nodes, :id => /[^\/]+/
69+
scope.resources :clients, :id => /[^\/]+/
6970
scope.resources :roles
7071

7172
scope.match("/status").to(:controller => "status", :action => "index").name(:status)

0 commit comments

Comments
 (0)