foreman_datacenter 1.19.7 → 1.20.0

data/app/views/foreman_datacenter/device_roles/index.html.erb

@@ -28,7 +28,7 @@
                   hash_for_edit_device_role_path(:id => device_role).merge(:auth_object => device_role, :authorizer => authorizer)
                 ),
                 display_fake_delete_if_authorized(
-                   hash_for_device_role_path(:id => device_role).merge(:auth_object => device_role, :authorizer => authorizer),
+                   hash_for_site_path(:id => device_role).merge(:auth_object => device_role, :authorizer => authorizer),
                    id: 'init-modal',
                    href: '#',
                    data: { objecttype: 'device_role',

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

@@ -12,7 +12,7 @@
                    :class => 'btn btn-warning'
                  ),
                  display_fake_delete_if_authorized(
-                     hash_for_device_role_path(id: @device_role),
+                     hash_for_site_path(id: @device_role),
                      class: 'btn btn-danger',
                      id: 'init-modal',
                      href: '#',

data/app/views/foreman_datacenter/device_types/index.html.erb

@@ -34,7 +34,7 @@
                   hash_for_edit_device_type_path(:id => device_type).merge(:auth_object => device_type, :authorizer => authorizer)
                 ),
                 display_fake_delete_if_authorized(
-                   hash_for_device_type_path(:id => device_type).merge(:auth_object => device_type, :authorizer => authorizer),
+                   hash_for_site_path(:id => device_type).merge(:auth_object => device_type, :authorizer => authorizer),
                    id: 'init-modal',
                    href: '#',
                    data: { objecttype: 'device_type',

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

@@ -12,7 +12,7 @@
                    :class => 'btn btn-warning'
                  ),
                  display_fake_delete_if_authorized(
-                     hash_for_device_type_path(id: @device_type),
+                     hash_for_site_path(id: @device_type),
                      class: 'btn btn-danger',
                      id: 'init-modal',
                      href: '#',

data/app/views/foreman_datacenter/devices/_interface.html.erb

@@ -8,24 +8,11 @@
       <td><%= h interface.mac_address %></td>
       <td><%= h interface.ip_address %></td>
       <td>
-        <% if interface.connected_interface %>
-          <%= link_to interface.connected_interface.device.name,
-                      device_path(interface.connected_interface.device) %>
-        <% else %>
-            <%= muted_text("Device not found", "span") %>
-        <% end %>
+        <%= link_to interface.connected_interface.device.name,
+                    device_path(interface.connected_interface.device) %>
       </td>
       <td>
-        <% if interface.connected_interface %>
-          <%= h interface.connected_interface.name %>
-        <% else %>
-            <%= muted_text("Interface not found", "span") %>
-        <% end %>
-      </td>
-      <td>
-        <%= h interface.connection.id %>
-        -
-        <%= h interface.form_factor %>
+        <%= h interface.connected_interface.name %>
       </td>
       <td></td>
       <td class="text-right">
@@ -69,7 +56,6 @@
       <td></td>
       <td class="text-muted">Not connected</td>
       <td></td>
-      <td></td>
       <td class="text-right">
         <%= link_to new_device_interface_device_interface_connection_path(interface),
                     class: 'btn btn-success btn-xs', title: 'Connect' do %>

data/app/views/foreman_datacenter/devices/index.html.erb

@@ -55,7 +55,7 @@
                   hash_for_edit_device_path(:id => device).merge(:auth_object => device, :authorizer => authorizer)
                 ),
                 display_fake_delete_if_authorized(
-                   hash_for_device_path(:id => device).merge(:auth_object => device, :authorizer => authorizer),
+                   hash_for_site_path(:id => device).merge(:auth_object => device, :authorizer => authorizer),
                    id: 'init-modal',
                    href: '#',
                    data: { objecttype: 'device',

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

@@ -256,10 +256,7 @@
         <% if @device.management_device %>
             <tr>
               <td><%= _("Console URL") %></td>
-              <td>
-                <%= link_to @device.console_url, "#{@device.console_url}", target: "_blank" %>
-              </td>
-
+              <td><%= h @device.console_url %></td>
             </tr>
             <tr>
               <td><%= _("Login") %></td>

data/app/views/foreman_datacenter/manufacturers/index.html.erb

@@ -30,7 +30,7 @@
                   hash_for_edit_manufacturer_path(:id => manufacturer).merge(:auth_object => manufacturer, :authorizer => authorizer)
                 ),
                 display_fake_delete_if_authorized(
-                    hash_for_manufacturer_path(:id => manufacturer).merge(:auth_object => manufacturer, :authorizer => authorizer),
+                    hash_for_site_path(:id => manufacturer).merge(:auth_object => manufacturer, :authorizer => authorizer),
                     id: 'init-modal',
                     href: '#',
                     data: { objecttype: 'manufacturer',

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

@@ -12,7 +12,7 @@
                    :class => 'btn btn-warning'
                  ),
                  display_fake_delete_if_authorized(
-                   hash_for_manufacturer_path(id: @manufacturer),
+                   hash_for_site_path(id: @manufacturer),
                    class: 'btn btn-danger',
                    id: 'init-modal',
                    href: '#',

data/app/views/foreman_datacenter/platforms/index.html.erb

@@ -28,7 +28,7 @@
                   hash_for_edit_platform_path(:id => platform).merge(:auth_object => platform, :authorizer => authorizer)
                 ),
                 display_fake_delete_if_authorized(
-                   hash_for_platform_path(:id => platform).merge(:auth_object => platform, :authorizer => authorizer),
+                   hash_for_site_path(:id => platform).merge(:auth_object => platform, :authorizer => authorizer),
                    id: 'init-modal',
                    href: '#',
                    data: { objecttype: 'platform',

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

@@ -12,14 +12,14 @@
                    :class => 'btn btn-warning'
                  ),
                  display_fake_delete_if_authorized(
-                   hash_for_platform_path(:id => @platform).merge(:auth_object => @platform, :authorizer => authorizer),
-                   class: 'btn btn-danger',
-                   id: 'init-modal',
-                   href: '#',
-                   data: { objecttype: 'platform',
-                           objectid: @platform.id,
-                           objectname: @platform.to_label,
-                           associatedobjects: associated_objects('platform') }
+                    hash_for_site_path(id: @platform),
+                    class: 'btn btn-danger',
+                    id: 'init-modal',
+                    href: '#',
+                    data: { objecttype: 'platform',
+                            objectid: @platform.id,
+                            objectname: @platform.to_label,
+                            associatedobjects: associated_objects('platform') }
                  )
                  help_path %>
 

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

@@ -68,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/rack_groups/welcome.html.erb

@@ -1,5 +1,3 @@
-<%= breadcrumbs(items: [{caption: _('Rack Groups'), url: rack_groups_path}, {caption: ""}]) %>
-
 <% content_for(:title, _("Rack Groups")) %>
 <div class="blank-slate-pf">
   <div class="blank-slate-pf-icon">

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/_device_position.html.erb.back

@@ -0,0 +1,28 @@
+<div class="col-md-5">
+  <div class="panel panel-default">
+    <div class="panel-heading"><strong>Devices</strong></div>
+    <table class="table table-hover panel-body">
+      <tbody>
+        <% @rack.positioned_devices.each do |position, devices| %>
+          <tr>
+            <td class="col-md-1"><%= position %>U</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) %>">
+                      <%= link_to d.name, device_path(d) %>
+                      <% if d.side.nil? %>
+                        *
+                      <% end %>
+                    </div>
+                  <% end %>
+              <% end %>
+          </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+  <div><h6 class="text-right">* side is not defined</h6></div>
+</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/welcome.html.erb

@@ -1,5 +1,3 @@
-<%= breadcrumbs(items: [{caption: _('Racks'), url: racks_path}, {caption: ""}]) %>
-
 <% content_for(:title, _("Racks")) %>
 <div class="blank-slate-pf">
   <div class="blank-slate-pf-icon">

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

@@ -96,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/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.19.7'.freeze
+  VERSION = '1.20.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 1.19.7
+  version: 1.20.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,11 +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/_dp.html.erb
+- app/views/foreman_datacenter/racks/_device_position.html.erb.back
 - 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
@@ -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,18 +0,0 @@
-<% stylesheet 'foreman_datacenter/datacenter' %>
-<% stylesheet 'foreman_datacenter/device_roles' %>
-<% stylesheet 'foreman_datacenter/horizontal-scroll' %>
-
-<% title h(@rack_group.name) %>
-
-<%= breadcrumbs(items: [{caption: _('Rack Group %s')   % @rack_group.name, url: rack_group_path(@rack_group)}, {caption: _('Racks Overview')}]) %>
-
-<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>