foreman_datacenter 1.16.12 → 1.19.0

data/app/views/foreman_datacenter/rack_groups/move.html.erb

@@ -1,5 +1,7 @@
 <% title _("Move associated objects") %>
 
+<%= breadcrumbs(items: [{caption: _('Rack Groups'), url: rack_groups_path}, {caption: _("Move associated objects")}]) %>
+
 <%= form_tag ('/datacenter/rack_group_update_associated_objects'), class: 'form-horizontal well' do %>
   <div class='clearfix'>
     <%= label_tag 'Rack Group *', nil, class: 'col-md-2 control-label' %>

data/app/views/foreman_datacenter/rack_groups/new.html.erb

@@ -1,3 +1,5 @@
 <% title _("Create Rack Group") %>
 
+<%= breadcrumbs(items: [{caption: _('Rack Groups'), url: rack_groups_path}, {caption: _("Create Rack Group")}]) %>
+
 <%= render 'form' %>

data/app/views/foreman_datacenter/rack_groups/show.html.erb

@@ -4,6 +4,8 @@
 
 <% title h(@rack_group.name) %>
 
+<%= breadcrumbs(items: [{caption: _('Rack Groups'), url: rack_groups_path}, {caption: _(@rack_group.to_label)}]) %>
+
 <% title_actions display_link_if_authorized(
                      _('Move associated objects'),
                      hash_for_move_rack_group_path(id: @rack_group),
@@ -66,10 +68,7 @@
       <table class="<%= table_css_classes 'table-fixed nonmarginbottom' %>">
         <tr>
           <td><%= _("Racks") %></td>
-          <td>
-            <%= link_to @rack_group.racks_count, racks_path(search: "rack_group=#{@rack_group.name}") %>
-            <%= link_to 'Overview', racks_rack_group_path(@rack_group), class: "btn btn-primary btn-xs pull-right" unless @rack_group.racks.empty? %>
-          </td>
+          <td><%= link_to @rack_group.racks_count, racks_path(search: "rack_group=#{@rack_group.name}") %></td>
         </tr>
         <tr>
           <td><%= _("Devices") %></td>

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

@@ -1,15 +1,15 @@
 <div class="panel panel-default">
-  <div class="panel-heading text-center"><h4 class="nonmargintop nonmarginbottom"><strong><%= link_to _("#{rack.name}"), rack_path(rack) %></strong></h4></div>
+  <div class="panel-heading"><strong><%= _("Devices") %></strong></div>
   <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
     <tbody>
-      <% rack.positioned_devices.each do |positions, devices| %>
+      <% @rack.positioned_devices.each do |positions, devices| %>
         <tr>
           <td class="col-md-1"><%= raw(positions.map{|p| "#{p}U"}.join("<br />")) %></td>
           <td class="col-md-4">
             <% unless devices.empty? %>
                 <% devices.each do |d| %>
                   <div class="<%= "text-" + ((d.side == "full" or d.side.nil?) ? "center" : "right") + " pull-" + ((d.side == "full" or d.side.nil?) ? "center" : d.side) %>">
-                    <div class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>" style="border-radius:40px;border:0px;">&nbsp;&nbsp;</div>
+		    <span class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>">&nbsp;</span>
                     <%= link_to d.name, device_path(d) %>
                     <% if d.side.nil? %>
                       *
@@ -23,24 +23,6 @@
           </td>
         </tr>
       <% end %>
-      <% unless rack.unpositioned_devices.empty? %>
-        <tr>
-          <td class="col-md-1">Unpositioned</br>Devices</td>
-          <td class="col-md-4" style="text-align:center">
-            <% rack.unpositioned_devices.each do |d| %>
-              <div class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>" style="border-radius:40px;border:0px;">&nbsp;&nbsp;</div>
-              <%= link_to d.name, device_path(d) %>
-              <% if d.side.nil? %>
-                *
-              <% end %>
-              <% if d.size.nil? %>
-                **
-              <% end %>
-              </br>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
     </tbody>
   </table>
 </div>

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

@@ -2,7 +2,7 @@
   <div class="panel-heading"><strong><%= _("Unpositioned Devices") %></strong></div>
   <table class="table table-hover panel-body nonmarginbottom">
     <tbody>
-      <% rack.unpositioned_devices.each do |d| %>
+      <% @rack.unpositioned_devices.each do |d| %>
         <tr>
           <td class="col-md-4">
             <div class="<%= "text-" + ((d.side == "full" or d.side.nil?) ? "center" : "right") + " pull-" + ((d.side == "full" or d.side.nil?) ? "center" : d.side) %>">

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

@@ -2,4 +2,6 @@
 
 <% title _("Edit %s") % @rack.to_label %>
 
+<%= breadcrumbs(items: [{caption: _("Racks %s") % @rack.to_label, url: rack_path(@rack)}, {caption: _('Edit %s' % @rack.to_label)}]) %>
+
 <%= render 'form' %>

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

@@ -1,5 +1,7 @@
 <% title _("Move associated objects") %>
 
+<%= breadcrumbs(items: [{caption: _('Racks'), url: racks_path}, {caption: _("Move associated objects")}]) %>
+
 <%= form_tag ('/datacenter/rack_update_associated_objects'), class: 'form-horizontal well' do %>
   <div class='clearfix'>
     <%= label_tag 'Rack *', nil, class: 'col-md-2 control-label' %>

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

@@ -2,4 +2,6 @@
 
 <% title _("Create Rack") %>
 
+<%= breadcrumbs(items: [{caption: _('Racks'), url: racks_path}, {caption: _("Create Rack")}]) %>
+
 <%= render 'form' %>

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

@@ -5,6 +5,8 @@
 
 <% title h(@rack.name) %>
 
+<%= breadcrumbs(items: [{caption: _('Racks'), url: racks_path}, {caption: _(@rack.to_label)}]) %>
+
 <% title_actions display_link_if_authorized(
                      _('Move associated objects'),
                      hash_for_move_rack_path(id: @rack),
@@ -90,6 +92,8 @@
   <div class="col-md-6">
     <!-- Devices -->
     <%= render "device_position", rack: @rack %>
+    <!-- Unpositioned Devices -->
+    <%= render "unpositioned_devices", rack: @rack if @rack.unpositioned_devices.count != 0 %>
     <div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
     <div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>
   </div>

data/app/views/foreman_datacenter/shared/_aa.html.erb

@@ -0,0 +1 @@
+<div style="color:red;width:100px;height:100px;">aaaaaaaaaaaaaaa</div>

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

@@ -1,3 +1,5 @@
 <% title _("Edit %s") % @site.to_label %>
 
+<%= breadcrumbs(items: [{caption: _("Site %s") % @site.to_label, url: site_path(@site)}, {caption: _('Edit %s' % @site.to_label)}]) %>
+
 <%= render 'form' %>

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

@@ -1,5 +1,7 @@
 <% title _("Move associated objects") %>
 
+<%= breadcrumbs(items: [{caption: _('Sites'), url: sites_path}, {caption: _("Move associated objects")}]) %>
+
 <%= form_tag ('/datacenter/site_update_associated_objects'), class: 'form-horizontal well' do %>
   <div class='clearfix'>
     <%= label_tag 'Site *', nil, class: 'col-md-2 control-label' %>

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

@@ -1,3 +1,5 @@
 <% title _("Create Site") %>
 
+<%= breadcrumbs(items: [{caption: _('Sites'), url: sites_path}, {caption: _("Create Site")}]) %>
+
 <%= render 'form' %>

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

@@ -4,6 +4,8 @@
 
 <% title h(@site.name) %>
 
+<%= breadcrumbs(items: [{caption: _('Sites'), url: '/datacenter/sites'}, {caption: _(@site.to_label)}]) %>
+
 <% title_actions display_link_if_authorized(
                      _('Move associated objects'),
                      hash_for_move_site_path(id: @site),
@@ -94,10 +96,7 @@
         </tr>
         <tr>
           <td><%= _("Racks") %></td>
-          <td>
-            <%= link_to @site.racks_count, racks_path(search: "site=#{@site.name}") %>
-            <%= link_to 'Overview', racks_site_path(@site), class: "btn btn-primary btn-xs pull-right" unless @site.racks.empty? %>
-          </td>
+          <td><%= link_to @site.racks_count, racks_path(search: "site=#{@site.name}") %></td>
         </tr>
         <tr>
           <td><%= _("Devices") %></td>

data/config/routes.rb

@@ -86,7 +86,6 @@ Foreman::Application.routes.draw do
     resources :sites do
       member do
         get :move
-        get :racks
       end
       collection do
         get 'auto_complete_search'
@@ -104,7 +103,6 @@ Foreman::Application.routes.draw do
     resources :rack_groups do
       member do
         get :move
-        get :racks
       end
       collection do
         get 'auto_complete_search'

data/db/migrate/20180725201545_add_location_id_and_organization_id_columns_to_devices.rb

@@ -1,4 +1,4 @@
-class AddLocationIdAndOrganizationIdColumnsToDevices < ActiveRecord::Migration
+class AddLocationIdAndOrganizationIdColumnsToDevices < ActiveRecord::Migration[4.2]
   def change
     add_column :devices, :organization_id, :integer
     add_column :devices, :location_id, :integer

data/lib/foreman_datacenter/engine.rb

@@ -28,7 +28,7 @@ module ForemanDatacenter
         requires_foreman '>= 1.12'
 
         security_block :datacenter do
-	  # Hosts
+    # Hosts
           permission :import_to_device, {
                       :'hosts' => [:import_to_device]},
                       :resource_type => "ForemanDatacenter::HostExtensions"
@@ -315,7 +315,7 @@ module ForemanDatacenter
                      :resource_type => "ForemanDatacenter::Rack"
           # Sites
           permission :view_sites, {
-                     :'foreman_datacenter/sites' => [:show, :index, :racks]},
+                     :'foreman_datacenter/sites' => [:show, :index]},
                      :resource_type => "ForemanDatacenter::Site"
           permission :create_sites, {
                      :'foreman_datacenter/sites' => [:new, :create]},

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '1.16.12'.freeze
+  VERSION = '1.19.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 1.16.12
+  version: 1.19.0
 platform: ruby
 authors:
 - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -90,7 +90,6 @@ 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
@@ -141,7 +140,6 @@ files:
 - app/controllers/concerns/foreman_datacenter/controller/parameters/rack.rb
 - app/controllers/concerns/foreman_datacenter/controller/parameters/rack_group.rb
 - app/controllers/concerns/foreman_datacenter/controller/parameters/site.rb
-- app/controllers/concerns/foreman_datacenter/controller/racks.rb
 - app/controllers/concerns/foreman_datacenter/hosts_controller_extensions.rb
 - app/controllers/foreman_datacenter/application_controller.rb
 - app/controllers/foreman_datacenter/comments_controller.rb
@@ -459,12 +457,10 @@ files:
 - app/views/foreman_datacenter/rack_groups/index.html.erb
 - app/views/foreman_datacenter/rack_groups/move.html.erb
 - app/views/foreman_datacenter/rack_groups/new.html.erb
-- app/views/foreman_datacenter/rack_groups/racks.html.erb
 - app/views/foreman_datacenter/rack_groups/show.html.erb
 - app/views/foreman_datacenter/rack_groups/welcome.html.erb
 - app/views/foreman_datacenter/racks/_device_position.html.erb
 - app/views/foreman_datacenter/racks/_device_position.html.erb.back
-- app/views/foreman_datacenter/racks/_dp.html.erb
 - app/views/foreman_datacenter/racks/_form.html.erb
 - app/views/foreman_datacenter/racks/_rack_groups.html.erb
 - app/views/foreman_datacenter/racks/_unpositioned_devices.html.erb
@@ -474,6 +470,7 @@ files:
 - app/views/foreman_datacenter/racks/new.html.erb
 - app/views/foreman_datacenter/racks/show.html.erb
 - app/views/foreman_datacenter/racks/welcome.html.erb
+- app/views/foreman_datacenter/shared/_aa.html.erb
 - app/views/foreman_datacenter/shared/_modal.html.erb
 - app/views/foreman_datacenter/shared/_rack_device_select.html.erb
 - app/views/foreman_datacenter/sites/_form.html.erb
@@ -481,7 +478,6 @@ files:
 - app/views/foreman_datacenter/sites/index.html.erb
 - app/views/foreman_datacenter/sites/move.html.erb
 - app/views/foreman_datacenter/sites/new.html.erb
-- app/views/foreman_datacenter/sites/racks.html.erb
 - app/views/foreman_datacenter/sites/show.html.erb
 - app/views/foreman_datacenter/sites/welcome.html.erb
 - app/views/hosts/import_to_device.html.erb
@@ -594,7 +590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A plugin that lets you document your servers in a datacenter

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

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

data/app/controllers/concerns/foreman_datacenter/controller/racks.rb

@@ -1,10 +0,0 @@
-module ForemanDatacenter::Controller::Racks
-  extend ActiveSupport::Concern
-
-  def move
-    @rack_groups = resource_base_search_and_page
-    @racks = @rack_group.racks
-    process_error object: @rack_group, error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
-  end
-
-end

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

@@ -1,16 +0,0 @@
-<% stylesheet 'foreman_datacenter/datacenter' %>
-<% stylesheet 'foreman_datacenter/device_roles' %>
-<% stylesheet 'foreman_datacenter/horizontal-scroll' %>
-
-<% title h(@rack_group.name) %>
-
-<div class="row horizontal-scroll">
-  <% @racks.each do |rack| %>
-    <div class="col-md-4">
-      <%= render "foreman_datacenter/racks/device_position", rack: rack %>
-    </div>
-  <% end %>
-</div>
-
-<div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
-<div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>

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

@@ -1,46 +0,0 @@
-<div class="panel panel-default">
-  <div class="panel-heading text-center"><h4 class="nonmargintop nonmarginbottom"><strong><%= _("#{rack.name}") %></strong></h4></div>
-  <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
-    <tbody>
-      <% rack.positioned_devices.each do |positions, devices| %>
-        <tr>
-          <td class="col-md-1"><%= raw(positions.map{|p| "#{p}U"}.join("<br />")) %></td>
-          <td class="col-md-4">
-            <% unless devices.empty? %>
-                <% devices.each do |d| %>
-                  <div class="<%= "text-" + ((d.side == "full" or d.side.nil?) ? "center" : "right") + " pull-" + ((d.side == "full" or d.side.nil?) ? "center" : d.side) %>">
-		    <span class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>">&nbsp;</span>
-                    <%= link_to d.name, device_path(d) %>
-                    <% if d.side.nil? %>
-                      *
-                    <% end %>
-                    <% if d.size.nil? %>
-                      **
-                    <% end %>
-                  </div>
-                <% end %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-      <% unless rack.unpositioned_devices.empty? %>
-        <tr>
-          <td class="col-md-1">Unpositioned Devices</td>
-          <td class="col-md-4">
-            <% rack.unpositioned_devices.each do |d| %>
-              <div class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>" style="border-radius:40px;border:0px;">&nbsp;&nbsp;</div>
-              <%= link_to d.name, device_path(d) %>
-              <% if d.side.nil? %>
-                *
-              <% end %>
-              <% if d.size.nil? %>
-                **
-              <% end %>
-              </br>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>

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

@@ -1,34 +0,0 @@
-<% stylesheet 'foreman_datacenter/datacenter' %>
-<% stylesheet 'foreman_datacenter/device_roles' %>
-<% stylesheet 'foreman_datacenter/horizontal-scroll' %>
-
-<% title h(@site.name) %>
-
-<% 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">
-        <%= 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>