foreman_datacenter 1.16.8 → 1.16.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e75dd583e1a71adb8a8754c58a72c1b2b71cde19aaadac57413fbbeeba906c1
-  data.tar.gz: 485c9e5335bd397e5df0a538096df3d7b00f2e8c9bbc8e851f239a04bced6907
+  metadata.gz: 94ce329914cc6e464c970b29a73a8f7594373aa85b74b2900dbe1cd526eb8fd8
+  data.tar.gz: 3acd7ceeac77e9f2401a7a997b0169bddc0e0e62a91feedff42c411ba2899284
 SHA512:
-  metadata.gz: 75fd9b3862257f6275abd548f41c2c81954e7230d475c0ec03736d3588df4ab2211595f46994270d54e14e3a7ec5ca0317e5edb0a9955f887473e95f1287fec7
-  data.tar.gz: 91f57fe420b02dae0a091143e804198f3e66534f446e62e9eb73c0581d0a6ca01b22c96a36af5fd624e4d4ca2e746c9df7a31ae2bb6e67daf999c507cd28135d
+  metadata.gz: 3d6109c79b9d5ba3804728a600259d698f90cc6339b3cfd6c7e0d9a49737d20fde77c5019cb9142997a9151d205f58c1e9a5ec15c465ac4e7022197046bfa3b9
+  data.tar.gz: a0f321fb5c392f250fe2435b790e0e07347bb27b00ee96f98701aa05732ce8c57c6e8a70a37cf36e2c03a4c036c12eb91c93cfce1cf6902a603f9aa93802da25

data/app/assets/stylesheets/foreman_datacenter/horizontal-scroll.css

@@ -0,0 +1,9 @@
+.horizontal-scroll {
+  overflow: auto;
+  white-space: nowrap;
+}
+
+.horizontal-scroll > div.col-md-4 {
+  display: inline-block;
+  float: none;
+}

data/app/controllers/api/v2/foreman_datacenter/device_interface_connections_controller.rb

@@ -34,7 +34,7 @@ module Api
 	def create
           @device_interface_connection = ::ForemanDatacenter::DeviceInterfaceConnection.new(device_interface_connection_params.merge(interface_a: params[:device_interface_id]))
           @device_interface_connection.first_interface = get_device_interface
-          @device_interface_connection.save
+	  process_response @device_interface_connection.save
 	end
 
 	api :DELETE, "/foreman_datacenter/device_interface_connections/:id/", N_("Delete a DeviceInterfaceConnection")

data/app/controllers/api/v2/foreman_datacenter/device_interfaces_controller.rb

@@ -37,7 +37,7 @@ module Api
 
 	def create
 	  @device_interface = ::ForemanDatacenter::DeviceInterface.new(device_interface_params)
-	  @device_interface.save
+	  process_response @device_interface.save
 	end
 
 	api :PUT, "/foreman_datacenter/device_interfaces/:id/", N_("Update a DeviceInterface")

data/app/controllers/api/v2/foreman_datacenter/devices_controller.rb

@@ -46,7 +46,7 @@ module Api
 	param_group :device, :as => :create
 
 	def create
-	  @device = ::ForemanDatacenter::Device.new(device_params.merge(hosy_id: params[:host_id]))
+	  @device = ::ForemanDatacenter::Device.new(device_params.merge(host_id: params[:host_id]))
 	  process_response @device.save
 	end
 

data/app/controllers/api/v2/foreman_datacenter/management_devices_controller.rb

@@ -34,7 +34,7 @@ module Api
 
 	def create
 	  @management_device = ::ForemanDatacenter::ManagementDevice.new(management_device_params)#.merge(device_id: params[]))
-	  @management_device.save
+	  process_response @management_device.save
 	end
 
 	api :PUT, "/foreman_datacenter/management_devices/:id/", N_("Update a management_device")

data/app/controllers/api/v2/foreman_datacenter/power_outlets_controller.rb

@@ -31,7 +31,7 @@ module Api
 
 	def create
 	  @power_outlet = ::ForemanDatacenter::PowerOutlet.new(power_outlet_params)
-	  @power_outlet.save
+	  process_response @power_outlet.save
 	end
 
 	api :PUT, "/foreman_datacenter/power_outlets/:id/", N_("Update a PowerOutlet")

data/app/controllers/api/v2/foreman_datacenter/racks_controller.rb

@@ -55,6 +55,12 @@ module Api
 	  process_response @rack.destroy
 	end
 
+        private
+
+        def allowed_nested_id
+          %w(site_id)
+        end
+
       end
     end
   end

data/app/controllers/api/v2/foreman_datacenter/sites_controller.rb

@@ -2,7 +2,7 @@ module Api
   module V2
     module ForemanDatacenter
       class SitesController < ForemanDatacenter::BaseController
-	include ::ForemanDatacenter::Controller::Parameters::Site
+        include ::ForemanDatacenter::Controller::Parameters::Site
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{show update destroy}
@@ -21,42 +21,36 @@ module Api
         def show
         end
 
-	def_param_group :site do
-	  param :site, Hash, :required => true, :action_aware => true do
-	    param :name, String, :required => true
-	    param :rack_ids, Array, :desc => N_("Rack IDs")
-	    param :rack_group_ids, Array, :desc => N_("RackGroup IDs")
-	  end
-	end
-
-	api :POST, "/foreman_datacemter/sites", N_("Create a site")
-	param_group :site, :as => :create
-
-	def create
-	  @site = ::ForemanDatacenter::Site.new(site_params)
-	  process_response @site.save
-	end
+        def_param_group :site do
+          param :site, Hash, :required => true, :action_aware => true do
+            param :name, String, :required => true
+            param :rack_ids, Array, :desc => N_("Rack IDs")
+            param :rack_group_ids, Array, :desc => N_("RackGroup IDs")
+          end
+        end
 
-	api :PUT, "/foreman_datacenter/sites/:id/", N_("Update a site")
-	param :id, :identifier, :required => true
-	param_group :site
+        api :POST, "/foreman_datacemter/sites", N_("Create a site")
+        param_group :site, :as => :create
 
-	def update
-	  process_response @site.update(site_params)
-	end
+        def create
+          @site = ::ForemanDatacenter::Site.new(site_params)
+          process_response @site.save
+        end
 
-	api :DELETE, "/foreman_datacenter/sites/:id/", N_("Delete a site")
-	param :id, :identifier, :required => true
+        api :PUT, "/foreman_datacenter/sites/:id/", N_("Update a site")
+        param :id, :identifier, :required => true
+        param_group :site
 
-	def destroy
-	  process_response @site.destroy
-	end
+        def update
+          process_response @site.update(site_params)
+        end
 
-	private
+        api :DELETE, "/foreman_datacenter/sites/:id/", N_("Delete a site")
+        param :id, :identifier, :required => true
 
-	# def allowed_nested_id
-	#   %w(operatingsystem_id)
-	# end
+        def destroy
+          process_response @site.destroy
+        end
 
       end
     end

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -17,11 +17,8 @@ module ForemanDatacenter
 
     def show
       @device = ForemanDatacenter::Device.includes(
-        power_ports: [:power_outlet, :device],
-        power_outlets: [:device, :power_port],
-        console_ports: [:console_server_port, :device],
-        console_server_ports: [:console_port, :device],
-        device_bays: [:installed_device],
+        power_ports: [:power_outlet],
+        console_ports: [:console_server_port],
         comments: [:user]
       ).find(params[:id])
       @comments = @device.comments

data/app/controllers/foreman_datacenter/rack_groups_controller.rb

@@ -59,7 +59,7 @@ module ForemanDatacenter
     end
 
     def racks
-      @racks = @rack_group.racks.includes(:devices)
+      @racks = @rack_group.racks.includes(devices: [:device_role])
       process_error redirect: rack_groups_path(@rack_group), error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
     end
 

data/app/controllers/foreman_datacenter/sites_controller.rb

@@ -51,8 +51,9 @@ module ForemanDatacenter
     end
 
     def racks
-      @racks = @site.racks.includes(:devices)
-      process_error redirect: site_path(@site), error_msg: 'Current site haven\'t any Racks.' if @racks.empty?
+      @rack_groups = @site.rack_groups.includes(racks: [devices: [:device_role]])
+      @ungrouped_racks = @site.racks.where(rack_group_id: nil)#.includes(:device_role)
+      process_error redirect: site_path(@site), error_msg: 'Current site haven\'t any Racks.' if (@rack_groups.empty? && @ungrouped_racks.empty?)
     end
 
     def move

data/app/models/foreman_datacenter/device_interface_connection.rb

@@ -35,7 +35,7 @@ module ForemanDatacenter
     end
 
     def second_device
-      first_interface.device
+      second_interface.device
     end
 
     def second_rack

data/app/views/foreman_datacenter/sites/racks.html.erb

@@ -1,17 +1,34 @@
 <% stylesheet 'foreman_datacenter/datacenter' %>
 <% stylesheet 'foreman_datacenter/device_roles' %>
+<% stylesheet 'foreman_datacenter/horizontal-scroll' %>
 
 <% title h(@site.name) %>
 
-<% @racks.in_groups_of(3).each do |g| %>
-  <div class="row">
-    <% g.compact.each do |rack| %>
+<% unless @rack_groups.empty? %>
+  <% @rack_groups.each do |rg| %>
+    <h2>
+      <%= rg.name %>
+    </h2>
+    <div class="row horizontal-scroll">
+      <% rg.racks.each do |rack| %>
+        <div class="col-md-4">
+          <%= render "foreman_datacenter/racks/device_position", rack: rack %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
+
+<% unless @ungrouped_racks.empty? %>
+  <h2>Ungrouped Racks</h2>
+  <div class="row horizontal-scroll">
+    <% @ungrouped_racks.each do |rack| %>
       <div class="col-md-4">
-        <!-- Devices -->
         <%= render "foreman_datacenter/racks/device_position", rack: rack %>
       </div>
     <% end %>
   </div>
 <% end %>
+
 <div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
 <div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '1.16.8'.freeze
+  VERSION = '1.16.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 1.16.8
+  version: 1.16.9
 platform: ruby
 authors:
 - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -90,6 +90,7 @@ files:
 - app/assets/stylesheets/foreman_datacenter/device_interface_connections.css
 - app/assets/stylesheets/foreman_datacenter/device_roles.css
 - app/assets/stylesheets/foreman_datacenter/devices.css
+- app/assets/stylesheets/foreman_datacenter/horizontal-scroll.css
 - app/assets/stylesheets/foreman_datacenter/modal.css
 - app/assets/stylesheets/foreman_datacenter/title_filter.css
 - app/controllers/api/v2/foreman_datacenter/base_controller.rb