Skip to content

Commit

Permalink
Merge pull request #708 from Jiri-Kremser/middleware-show-fix
Browse files Browse the repository at this point in the history
Fixing the navigation logic and Angular controllers for Middleware provider
  • Loading branch information
martinpovolny authored Mar 16, 2017
2 parents 481b3a0 + b7bd3f7 commit 78af57d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
4 changes: 4 additions & 0 deletions app/controllers/middleware_domain_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ def self.display_methods
%w(middleware_server_groups)
end

def self.default_show_template
"#{model.name.underscore}/show"
end

menu_section :cnt

private
Expand Down
4 changes: 4 additions & 0 deletions app/controllers/middleware_server_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ def self.display_methods
%w(middleware_datasources middleware_deployments middleware_messagings)
end

def self.default_show_template
"#{model.name.underscore}/show"
end

def button
selected_operation = params[:pressed].to_sym

Expand Down
4 changes: 4 additions & 0 deletions app/controllers/middleware_server_group_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ def self.display_methods
%w(middleware_servers)
end

def self.default_show_template
"#{model.name.underscore}/show"
end

def textual_group_list
[%i(properties), %i(relationships smart_management)]
end
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/views/ems_common/_show.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#main_div
- arr = %w(container_images container_image_registries containers container_replicators container_routes)
- arr.concat(%w(container_builds container_projects container_nodes container_services container_groups availability_zones host_aggregates))
- arr.concat(%w(middleware_servers middleware_deployments middleware_datasources middleware_domains middleware_messagings))
- arr.concat(%w(middleware_servers middleware_server_groups middleware_deployments middleware_datasources middleware_domains middleware_messagings))
- arr.concat(%w(security_groups floating_ips cloud_subnets network_routers network_ports cloud_networks))
- arr.concat(%w(load_balancers container_templates))
- arr.concat(%w(cloud_tenants ems_clusters flavors resource_group hosts instances images miq_templates cloud_volumes))
Expand Down

0 comments on commit 78af57d

Please sign in to comment.