Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ManageIQ/manageiq-ui-classic
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 513fff8bd934864af57744afbeeb2d4f162331c9
Choose a base ref
..
head repository: ManageIQ/manageiq-ui-classic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4aa683d5065144be15019d47f3c70e08ea988a9d
Choose a head ref
Showing with 410 additions and 22 deletions.
  1. +1 −1 app/assets/stylesheets/pdf/{_fontawesome.scss.erb → _fontawesome.scss}
  2. +1 −1 app/assets/stylesheets/pdf/{_patternfly.scss.erb → _patternfly.scss}
  3. +20 −9 app/controllers/mixins/custom_button_dialog_form_mixin.rb
  4. +1 −1 app/controllers/ops_controller.rb
  5. +6 −0 app/decorators/availability_zone_decorator.rb
  6. +6 −0 app/decorators/cloud_network_decorator.rb
  7. +6 −0 app/decorators/cloud_object_store_container_decorator.rb
  8. +6 −0 app/decorators/cloud_object_store_object_decorator.rb
  9. +6 −0 app/decorators/cloud_subnet_decorator.rb
  10. +6 −0 app/decorators/cloud_tenant_decorator.rb
  11. +6 −0 app/decorators/cloud_volume_backup_decorator.rb
  12. +6 −0 app/decorators/cloud_volume_decorator.rb
  13. +6 −0 app/decorators/cloud_volume_snapshot_decorator.rb
  14. +6 −0 app/decorators/container_build_decorator.rb
  15. +6 −0 app/decorators/container_decorator.rb
  16. +6 −0 app/decorators/container_group_decorator.rb
  17. +6 −0 app/decorators/container_image_decorator.rb
  18. +6 −0 app/decorators/container_image_registry_decorator.rb
  19. +6 −0 app/decorators/container_node_decorator.rb
  20. +6 −0 app/decorators/container_project_decorator.rb
  21. +6 −0 app/decorators/container_replicator_decorator.rb
  22. +6 −0 app/decorators/container_route_decorator.rb
  23. +6 −0 app/decorators/container_service_decorator.rb
  24. +6 −0 app/decorators/container_template_decorator.rb
  25. +6 −0 app/decorators/container_volume_decorator.rb
  26. +6 −0 app/decorators/ems_cluster_decorator.rb
  27. +6 −0 app/decorators/ext_management_system_decorator.rb
  28. +6 −0 app/decorators/flavor_decorator.rb
  29. +6 −0 app/decorators/floating_ip_decorator.rb
  30. +11 −0 app/decorators/host_aggregate_decorator.rb
  31. +6 −0 app/decorators/host_decorator.rb
  32. +6 −0 app/decorators/load_balancer_decorator.rb
  33. +6 −0 app/decorators/manageiq/providers/cloud_manager/auth_key_pair_decorator.rb
  34. +6 −0 app/decorators/manageiq/providers/cloud_manager_decorator.rb
  35. +6 −0 app/decorators/manageiq/providers/configuration_manager_decorator.rb
  36. +6 −0 app/decorators/manageiq/providers/container_manager_decorator.rb
  37. +6 −0 app/decorators/manageiq/providers/infra_manager_decorator.rb
  38. +6 −0 app/decorators/manageiq/providers/physical_infra_manager_decorator.rb
  39. +6 −0 app/decorators/miq_template_decorator.rb
  40. +6 −0 app/decorators/network_port_decorator.rb
  41. +6 −0 app/decorators/network_router_decorator.rb
  42. +6 −0 app/decorators/orchestration_stack_decorator.rb
  43. +6 −0 app/decorators/physical_server_decorator.rb
  44. +6 −0 app/decorators/resource_pool_decorator.rb
  45. +6 −0 app/decorators/security_group_decorator.rb
  46. +9 −8 app/decorators/storage_decorator.rb
  47. +6 −0 app/decorators/vm_or_template_decorator.rb
  48. +1 −1 app/presenters/tree_builder_roles_by_server.rb
  49. +24 −0 app/services/dialog_local_service.rb
  50. +95 −0 spec/controllers/mixins/custom_button_dialog_form_mixin_spec.rb
  51. +1 −1 spec/helpers/quadicon_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

@font-face {
font-family: 'FontAwesome';
src: url(<%= asset_data_uri("bower_components/font-awesome/fonts/fontawesome-webfont.ttf") %>);
src: asset_url("bower_components/font-awesome/fonts/fontawesome-webfont.ttf");
font-weight: normal;
font-style: normal;
}
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

@font-face {
font-family: "PatternFlyIcons-webfont";
src: url(<%= asset_data_uri("PatternFlyIcons-webfont.ttf") %>);
src: asset_url("PatternFlyIcons-webfont.ttf");
font-weight: normal;
font-style: normal;
}
29 changes: 20 additions & 9 deletions app/controllers/mixins/custom_button_dialog_form_mixin.rb
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
module Mixins
module CustomButtonDialogFormMixin
def set_custom_button_dialog_presenter
def set_custom_button_dialog_presenter(options)
presenter ||= ExplorerPresenter.new(
:active_tree => x_active_tree,
)
presenter.show(:default_left_cell).hide(:custom_left_cell)
presenter.update(:main_div, r[:partial => "shared/dialogs/dialog_provision"])
presenter.update(:form_buttons_div, r[
:partial => 'layouts/x_dialog_buttons',
:locals => {
:action_url => "dialog_form_button_pressed",
:record_id => @edit[:rec_id],
}
presenter.update(:main_div, r[
:partial => "shared/dialogs/dialog_provision",
:locals => options[:dialog_locals]
])
presenter.show(:form_buttons_div)
unless using_new_dialog_runner?(options)
presenter.update(:form_buttons_div, r[
:partial => 'layouts/x_dialog_buttons',
:locals => {
:action_url => "dialog_form_button_pressed",
:record_id => @edit[:rec_id],
}
])
presenter.show(:form_buttons_div)
end
presenter[:right_cell_text] = @right_cell_text
presenter.set_visibility(false, :toolbar)
presenter.set_visibility(false, :adv_searchbox_div)
presenter[:lock_sidebar] = true
presenter
end

private

def using_new_dialog_runner?(options)
options[:dialog_locals].present? && options[:dialog_locals][:force_old_dialog_use].to_s == "false"
end
end
end
2 changes: 1 addition & 1 deletion app/controllers/ops_controller.rb
Original file line number Diff line number Diff line change
@@ -537,7 +537,7 @@ def open_parent_nodes
def replace_right_cell(options = {}) # replace_trees can be an array of tree symbols to be replaced
nodetype, replace_trees = options.values_at(:nodetype, :replace_trees)
if params[:pressed] == "custom_button"
presenter = set_custom_button_dialog_presenter
presenter = set_custom_button_dialog_presenter(options)
render :json => presenter.for_render
return
end
6 changes: 6 additions & 0 deletions app/decorators/availability_zone_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/availability_zone.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_network_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_network.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_object_store_container_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_object_store_container.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_object_store_object_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_object_store_container.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_subnet_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_subnet.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_tenant_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_tenant.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_volume_backup_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_volume.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_volume_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_volume.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/cloud_volume_snapshot_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/cloud_volume_snapshot.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_build_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_build.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_group_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_group.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_image_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_image.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_image_registry_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_image_registry.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_node_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_node.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_project_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_project.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_replicator_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_replicator.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_route_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_route.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_service_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_service.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_template_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/container_template.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/container_volume_decorator.rb
Original file line number Diff line number Diff line change
@@ -2,4 +2,10 @@ class ContainerVolumeDecorator < MiqDecorator
def self.fonticon
'pficon pficon-volume'
end

def single_quad
{
:fileicon => '100/container_volume.png'
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/ems_cluster_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/ems_cluster.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/ext_management_system_decorator.rb
Original file line number Diff line number Diff line change
@@ -25,4 +25,10 @@ def quadicon
}
}
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/flavor_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/flavor.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/floating_ip_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/floating_ip.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
11 changes: 11 additions & 0 deletions app/decorators/host_aggregate_decorator.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class HostAggregateDecorator < MiqDecorator
def self.fonticon
'pficon pficon-screen'
end

def single_quad
{
:fileicon => '100/host_aggregate.png'
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/host_decorator.rb
Original file line number Diff line number Diff line change
@@ -21,4 +21,10 @@ def quadicon
}
}
end

def single_quad
{
:fileicon => fileicon
}
end
end
6 changes: 6 additions & 0 deletions app/decorators/load_balancer_decorator.rb
Original file line number Diff line number Diff line change
@@ -6,4 +6,10 @@ def self.fonticon
def self.fileicon
'100/load_balancer.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
Original file line number Diff line number Diff line change
@@ -3,5 +3,11 @@ class CloudManager::AuthKeyPairDecorator < MiqDecorator
def self.fileicon
'100/auth_key_pair.png'
end

def single_quad
{
:fileicon => fileicon
}
end
end
end
Loading