foreman_datacenter 1.16.8 → 1.16.9

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3e75dd583e1a71adb8a8754c58a72c1b2b71cde19aaadac57413fbbeeba906c1
4
- data.tar.gz: 485c9e5335bd397e5df0a538096df3d7b00f2e8c9bbc8e851f239a04bced6907
3
+ metadata.gz: 94ce329914cc6e464c970b29a73a8f7594373aa85b74b2900dbe1cd526eb8fd8
4
+ data.tar.gz: 3acd7ceeac77e9f2401a7a997b0169bddc0e0e62a91feedff42c411ba2899284
5
5
  SHA512:
6
- metadata.gz: 75fd9b3862257f6275abd548f41c2c81954e7230d475c0ec03736d3588df4ab2211595f46994270d54e14e3a7ec5ca0317e5edb0a9955f887473e95f1287fec7
7
- data.tar.gz: 91f57fe420b02dae0a091143e804198f3e66534f446e62e9eb73c0581d0a6ca01b22c96a36af5fd624e4d4ca2e746c9df7a31ae2bb6e67daf999c507cd28135d
6
+ metadata.gz: 3d6109c79b9d5ba3804728a600259d698f90cc6339b3cfd6c7e0d9a49737d20fde77c5019cb9142997a9151d205f58c1e9a5ec15c465ac4e7022197046bfa3b9
7
+ data.tar.gz: a0f321fb5c392f250fe2435b790e0e07347bb27b00ee96f98701aa05732ce8c57c6e8a70a37cf36e2c03a4c036c12eb91c93cfce1cf6902a603f9aa93802da25
@@ -0,0 +1,9 @@
1
+ .horizontal-scroll {
2
+ overflow: auto;
3
+ white-space: nowrap;
4
+ }
5
+
6
+ .horizontal-scroll > div.col-md-4 {
7
+ display: inline-block;
8
+ float: none;
9
+ }
@@ -34,7 +34,7 @@ module Api
34
34
  def create
35
35
  @device_interface_connection = ::ForemanDatacenter::DeviceInterfaceConnection.new(device_interface_connection_params.merge(interface_a: params[:device_interface_id]))
36
36
  @device_interface_connection.first_interface = get_device_interface
37
- @device_interface_connection.save
37
+ process_response @device_interface_connection.save
38
38
  end
39
39
 
40
40
  api :DELETE, "/foreman_datacenter/device_interface_connections/:id/", N_("Delete a DeviceInterfaceConnection")
@@ -37,7 +37,7 @@ module Api
37
37
 
38
38
  def create
39
39
  @device_interface = ::ForemanDatacenter::DeviceInterface.new(device_interface_params)
40
- @device_interface.save
40
+ process_response @device_interface.save
41
41
  end
42
42
 
43
43
  api :PUT, "/foreman_datacenter/device_interfaces/:id/", N_("Update a DeviceInterface")
@@ -46,7 +46,7 @@ module Api
46
46
  param_group :device, :as => :create
47
47
 
48
48
  def create
49
- @device = ::ForemanDatacenter::Device.new(device_params.merge(hosy_id: params[:host_id]))
49
+ @device = ::ForemanDatacenter::Device.new(device_params.merge(host_id: params[:host_id]))
50
50
  process_response @device.save
51
51
  end
52
52
 
@@ -34,7 +34,7 @@ module Api
34
34
 
35
35
  def create
36
36
  @management_device = ::ForemanDatacenter::ManagementDevice.new(management_device_params)#.merge(device_id: params[]))
37
- @management_device.save
37
+ process_response @management_device.save
38
38
  end
39
39
 
40
40
  api :PUT, "/foreman_datacenter/management_devices/:id/", N_("Update a management_device")
@@ -31,7 +31,7 @@ module Api
31
31
 
32
32
  def create
33
33
  @power_outlet = ::ForemanDatacenter::PowerOutlet.new(power_outlet_params)
34
- @power_outlet.save
34
+ process_response @power_outlet.save
35
35
  end
36
36
 
37
37
  api :PUT, "/foreman_datacenter/power_outlets/:id/", N_("Update a PowerOutlet")
@@ -55,6 +55,12 @@ module Api
55
55
  process_response @rack.destroy
56
56
  end
57
57
 
58
+ private
59
+
60
+ def allowed_nested_id
61
+ %w(site_id)
62
+ end
63
+
58
64
  end
59
65
  end
60
66
  end
@@ -2,7 +2,7 @@ module Api
2
2
  module V2
3
3
  module ForemanDatacenter
4
4
  class SitesController < ForemanDatacenter::BaseController
5
- include ::ForemanDatacenter::Controller::Parameters::Site
5
+ include ::ForemanDatacenter::Controller::Parameters::Site
6
6
 
7
7
  before_action :find_optional_nested_object
8
8
  before_action :find_resource, :only => %w{show update destroy}
@@ -21,42 +21,36 @@ module Api
21
21
  def show
22
22
  end
23
23
 
24
- def_param_group :site do
25
- param :site, Hash, :required => true, :action_aware => true do
26
- param :name, String, :required => true
27
- param :rack_ids, Array, :desc => N_("Rack IDs")
28
- param :rack_group_ids, Array, :desc => N_("RackGroup IDs")
29
- end
30
- end
31
-
32
- api :POST, "/foreman_datacemter/sites", N_("Create a site")
33
- param_group :site, :as => :create
34
-
35
- def create
36
- @site = ::ForemanDatacenter::Site.new(site_params)
37
- process_response @site.save
38
- end
24
+ def_param_group :site do
25
+ param :site, Hash, :required => true, :action_aware => true do
26
+ param :name, String, :required => true
27
+ param :rack_ids, Array, :desc => N_("Rack IDs")
28
+ param :rack_group_ids, Array, :desc => N_("RackGroup IDs")
29
+ end
30
+ end
39
31
 
40
- api :PUT, "/foreman_datacenter/sites/:id/", N_("Update a site")
41
- param :id, :identifier, :required => true
42
- param_group :site
32
+ api :POST, "/foreman_datacemter/sites", N_("Create a site")
33
+ param_group :site, :as => :create
43
34
 
44
- def update
45
- process_response @site.update(site_params)
46
- end
35
+ def create
36
+ @site = ::ForemanDatacenter::Site.new(site_params)
37
+ process_response @site.save
38
+ end
47
39
 
48
- api :DELETE, "/foreman_datacenter/sites/:id/", N_("Delete a site")
49
- param :id, :identifier, :required => true
40
+ api :PUT, "/foreman_datacenter/sites/:id/", N_("Update a site")
41
+ param :id, :identifier, :required => true
42
+ param_group :site
50
43
 
51
- def destroy
52
- process_response @site.destroy
53
- end
44
+ def update
45
+ process_response @site.update(site_params)
46
+ end
54
47
 
55
- private
48
+ api :DELETE, "/foreman_datacenter/sites/:id/", N_("Delete a site")
49
+ param :id, :identifier, :required => true
56
50
 
57
- # def allowed_nested_id
58
- # %w(operatingsystem_id)
59
- # end
51
+ def destroy
52
+ process_response @site.destroy
53
+ end
60
54
 
61
55
  end
62
56
  end
@@ -17,11 +17,8 @@ module ForemanDatacenter
17
17
 
18
18
  def show
19
19
  @device = ForemanDatacenter::Device.includes(
20
- power_ports: [:power_outlet, :device],
21
- power_outlets: [:device, :power_port],
22
- console_ports: [:console_server_port, :device],
23
- console_server_ports: [:console_port, :device],
24
- device_bays: [:installed_device],
20
+ power_ports: [:power_outlet],
21
+ console_ports: [:console_server_port],
25
22
  comments: [:user]
26
23
  ).find(params[:id])
27
24
  @comments = @device.comments
@@ -59,7 +59,7 @@ module ForemanDatacenter
59
59
  end
60
60
 
61
61
  def racks
62
- @racks = @rack_group.racks.includes(:devices)
62
+ @racks = @rack_group.racks.includes(devices: [:device_role])
63
63
  process_error redirect: rack_groups_path(@rack_group), error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
64
64
  end
65
65
 
@@ -51,8 +51,9 @@ module ForemanDatacenter
51
51
  end
52
52
 
53
53
  def racks
54
- @racks = @site.racks.includes(:devices)
55
- process_error redirect: site_path(@site), error_msg: 'Current site haven\'t any Racks.' if @racks.empty?
54
+ @rack_groups = @site.rack_groups.includes(racks: [devices: [:device_role]])
55
+ @ungrouped_racks = @site.racks.where(rack_group_id: nil)#.includes(:device_role)
56
+ process_error redirect: site_path(@site), error_msg: 'Current site haven\'t any Racks.' if (@rack_groups.empty? && @ungrouped_racks.empty?)
56
57
  end
57
58
 
58
59
  def move
@@ -35,7 +35,7 @@ module ForemanDatacenter
35
35
  end
36
36
 
37
37
  def second_device
38
- first_interface.device
38
+ second_interface.device
39
39
  end
40
40
 
41
41
  def second_rack
@@ -1,17 +1,34 @@
1
1
  <% stylesheet 'foreman_datacenter/datacenter' %>
2
2
  <% stylesheet 'foreman_datacenter/device_roles' %>
3
+ <% stylesheet 'foreman_datacenter/horizontal-scroll' %>
3
4
 
4
5
  <% title h(@site.name) %>
5
6
 
6
- <% @racks.in_groups_of(3).each do |g| %>
7
- <div class="row">
8
- <% g.compact.each do |rack| %>
7
+ <% unless @rack_groups.empty? %>
8
+ <% @rack_groups.each do |rg| %>
9
+ <h2>
10
+ <%= rg.name %>
11
+ </h2>
12
+ <div class="row horizontal-scroll">
13
+ <% rg.racks.each do |rack| %>
14
+ <div class="col-md-4">
15
+ <%= render "foreman_datacenter/racks/device_position", rack: rack %>
16
+ </div>
17
+ <% end %>
18
+ </div>
19
+ <% end %>
20
+ <% end %>
21
+
22
+ <% unless @ungrouped_racks.empty? %>
23
+ <h2>Ungrouped Racks</h2>
24
+ <div class="row horizontal-scroll">
25
+ <% @ungrouped_racks.each do |rack| %>
9
26
  <div class="col-md-4">
10
- <!-- Devices -->
11
27
  <%= render "foreman_datacenter/racks/device_position", rack: rack %>
12
28
  </div>
13
29
  <% end %>
14
30
  </div>
15
31
  <% end %>
32
+
16
33
  <div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
17
34
  <div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>
@@ -1,3 +1,3 @@
1
1
  module ForemanDatacenter
2
- VERSION = '1.16.8'.freeze
2
+ VERSION = '1.16.9'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_datacenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.16.8
4
+ version: 1.16.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-06-25 00:00:00.000000000 Z
12
+ date: 2019-07-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: prawn
@@ -90,6 +90,7 @@ files:
90
90
  - app/assets/stylesheets/foreman_datacenter/device_interface_connections.css
91
91
  - app/assets/stylesheets/foreman_datacenter/device_roles.css
92
92
  - app/assets/stylesheets/foreman_datacenter/devices.css
93
+ - app/assets/stylesheets/foreman_datacenter/horizontal-scroll.css
93
94
  - app/assets/stylesheets/foreman_datacenter/modal.css
94
95
  - app/assets/stylesheets/foreman_datacenter/title_filter.css
95
96
  - app/controllers/api/v2/foreman_datacenter/base_controller.rb