foreman_datacenter 1.16.2 → 1.16.3

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: 0c79b56b0d5d8d3e92e1ba5b4156b8597a9c434985db6c253d32218d4a5e98d0
4
- data.tar.gz: 0a47417f1721478088133b82761da71580292b90d197ab23d12fdea4f6a10732
3
+ metadata.gz: 0d7838439cf0317b18a54913c631f9f13d02a7dd9f6e69a56d03b51e6a915295
4
+ data.tar.gz: fb196c778932a612baacbdb63eccd2f2ce223b1530bca3c32659c5e0b71fb1e6
5
5
  SHA512:
6
- metadata.gz: 970537609cdc286e2cfdf92d6a73f58f1a874de5ad513ba43044b8694bf3b1ef23ddb344abedac6739709d0a2db40ebda3ff179b0c3b2429a4e038f17cc92f5c
7
- data.tar.gz: 331c0267881666fcfe3efbffba1dcbfd4a2e6f9758caeb395579f3a1db9b87699fad710ed2cc4a8db8ea0f9c85eb67637e95d99b433cf693936875cb0d1fb02a
6
+ metadata.gz: d1d36b825c8bf657199aa7252d4c613cd3adb0622f40b59c5d88cbdb673a49246b8391078252fa481b73c0f0199e1a6bebc90d23d78265c36192e3a5f228422e
7
+ data.tar.gz: 7473df84eac2f719a45491d916f6119ba70b34624c1e31526484756432819d65669e9c6522cd376df1aa0c639a4f94c1ed27c7d9f3fdf5dacfefe01f97fb546d
@@ -3,7 +3,7 @@ module ForemanDatacenter
3
3
  include Foreman::Controller::AutoCompleteSearch
4
4
  include ForemanDatacenter::Controller::Parameters::RackGroup
5
5
 
6
- before_action :find_resource, only: [:show, :edit, :update, :destroy, :move]
6
+ before_action :find_resource, only: [:show, :edit, :update, :destroy, :move, :racks]
7
7
 
8
8
  def index
9
9
  @rack_groups = resource_base_search_and_page.includes(:site, :racks)
@@ -58,6 +58,11 @@ module ForemanDatacenter
58
58
  process_error object: @rack_group, error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
59
59
  end
60
60
 
61
+ def racks
62
+ @racks = @rack_group.racks.includes(:devices)
63
+ process_error redirect: rack_groups_path(@rack_group), error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
64
+ end
65
+
61
66
  def update_associated_objects
62
67
  begin
63
68
  @rack_group = ForemanDatacenter::RackGroup.find(request.env['HTTP_REFERER'].split('/')[-2])
@@ -0,0 +1,18 @@
1
+ <% stylesheet 'foreman_datacenter/datacenter' %>
2
+ <% stylesheet 'foreman_datacenter/device_roles' %>
3
+
4
+ <% title h(@rack_group.name) %>
5
+
6
+ <% @racks.in_groups_of(3).each do |g| %>
7
+ <div class="row">
8
+ <% g.compact.each do |rack| %>
9
+ <div class="col-md-4">
10
+ <!-- Devices -->
11
+ <%= render "foreman_datacenter/racks/device_position", rack: rack %>
12
+ </div>
13
+ <% end %>
14
+ </div>
15
+ <% end %>
16
+ <div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
17
+ <div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>
18
+
data/config/routes.rb CHANGED
@@ -95,6 +95,7 @@ Foreman::Application.routes.draw do
95
95
  resources :racks do
96
96
  member do
97
97
  get :move
98
+ get :racks
98
99
  end
99
100
  collection do
100
101
  get 'auto_complete_search'
@@ -1,3 +1,3 @@
1
1
  module ForemanDatacenter
2
- VERSION = '1.16.2'.freeze
2
+ VERSION = '1.16.3'.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.2
4
+ version: 1.16.3
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-05-18 00:00:00.000000000 Z
12
+ date: 2019-05-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: prawn
@@ -458,6 +458,7 @@ files:
458
458
  - app/views/foreman_datacenter/rack_groups/index.html.erb
459
459
  - app/views/foreman_datacenter/rack_groups/move.html.erb
460
460
  - app/views/foreman_datacenter/rack_groups/new.html.erb
461
+ - app/views/foreman_datacenter/rack_groups/racks.html.erb
461
462
  - app/views/foreman_datacenter/rack_groups/show.html.erb
462
463
  - app/views/foreman_datacenter/rack_groups/welcome.html.erb
463
464
  - app/views/foreman_datacenter/racks/_device_position.html.erb