foreman_datacenter 1.19.7 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84640630e670843cfe36d46218531768f0efd8ed7e9c62864d055644670df22f
-  data.tar.gz: fc6b920de842dcf439db6870f1949adadc5194f0fc07ce308c15e28ca828fd0c
+  metadata.gz: 8c0adb804adfec62786dee07833649ab955ae34574e444ed593ee800dde72fd1
+  data.tar.gz: 207f8b66049006107cdfba1dd403d739d99a05c7cbfb5a6a474eb7343eafbebe
 SHA512:
-  metadata.gz: 07dc962797b0fa4fc6f5ac0a7aabd10659a816bc1677ba35d59d81153082b5fe5b9eb7a596735aabe77f3378c91b6cb9e644b46caaa2d7d40ac40fdd3cd5f0b1
-  data.tar.gz: c7c102e91e7aa69cfe8bd634dba8e27f1952936936cdc62fd0ee9a396a24cc9c5275ca70812db02ac25b4263c9a356b744a9cbeb041eab7eecb0c649f37e1097
+  metadata.gz: 075f03def088ee4a1d8895037594f184f7f384eec6f1654cc29c2e48fcb8176e2e25a9d0e58fcb481da21545cc11fabcfb2e804a86a12190d290ec51435fe366
+  data.tar.gz: 0bcbd8458d653517edcecc1c471ba9fed8d7fa940cb4feb52c6a590738bae538d542129eb759455c25e16211e1d920ab31d4f8714377e65815cac31617f1b7ae

data/app/assets/javascripts/foreman_datacenter/modal.js

@@ -8,10 +8,9 @@ $(window).click(function(event) {
     var pathname = window.location.pathname; // Returns path only
     var str = "/" + object_id;
     var patt = new RegExp(str);
-    var token = $('meta[name="csrf-token"]').attr('content');
+    console.log(object_type);
     if (object_type == 'device') {
-      // var checkbox_label = 'Delete associated host ONLY and keep current device as UNASSIGNED!'
-      var checkbox_label = ''
+      var checkbox_label = 'Delete associated host ONLY and keep current device as UNASSIGNED!'
     } else {
       var checkbox_label = 'Delete ' +  object_type + ' ONLY'
     }
@@ -19,19 +18,6 @@ $(window).click(function(event) {
     if (!(patt.test(pathname))) {
       pathname = pathname + str
     }
-    var move = "<p></p>"
-    var checkbox = ""
-    var text = "You will permanently delete the"
-    text_ao = ""
-    if (object_type == "site" || object_type == "rack" || object_type == "rack_group") {
-      move = '<p>You also can move associated object to another <strong>' + object_type + '</strong> before you destroy it.</p> \
-          <a class="btn btn-block btn-primary modal-btn modal-btn-primary marginbottomsixteen" href="/datacenter/' + object_type + 's/' + object_id + '/move">Move associated objects</a>'
-      checkbox = '<input type="checkbox" name="object_only" id="object_only" value="true" checked="checked">'
-      text = "By unselecting checkbox you will permanently delete the"
-      text_ao = 'with \
-            <strong>ALL</strong> \
-            associated objects' + ao
-    }
 
     var form = '<div id="myModal" class="modal"> \
       <div class="modal-content"> \
@@ -45,19 +31,20 @@ $(window).click(function(event) {
         <div class="modal-body"> \
           <p>This action \
             <strong>cannot</strong> \
-            be undone. \
-            ' + text + ' \
+            be undone. By unselecting checkbox you will permanently delete the \
             <strong>' + object_name + '</strong> \
-            ' + text_ao + ' \
+            with \
+            <strong>all</strong> \
+            associated objects' + ao + ' \
           </p> \
           <form class="modal-form nonpaddingbottom" action=' + pathname + ' accept-charset="UTF-8" method="post"> \
             <input type="hidden" name="_method" value="delete"> \
-            <input type="hidden" name="authenticity_token" value=' + token + '> \
-            ' + checkbox + ' \
+            <input type="checkbox" name="object_only" id="object_only" value="true" checked="checked"> \
             <label>' + checkbox_label + '</label> \
             <input type="submit" name="commit" value="I understand the consequences, delete this ' + object_type + '" class="btn btn-block btn-danger modal-btn modal-btn-danger"> \
 	  </form> \
-          '+ move +' \
+          <p>You also can move associated object to another <strong>' + object_type + '</strong> before you destroy it.</p> \
+          <a class="btn btn-block btn-primary modal-btn modal-btn-primary marginbottomsixteen" href="/datacenter/' + object_type + 's/' + object_id + '/move">Move associated objects</a> \
         </div> \
       </div> \
     </div>'

data/app/assets/stylesheets/foreman_datacenter/datacenter.css

@@ -9,6 +9,3 @@
 .nonbordercolor {
   border-color: transparent !important;
 }
-.nonmargintop {
-  margin-top: 0px !important;
-}

data/app/assets/stylesheets/foreman_datacenter/device_roles.css

@@ -28,35 +28,3 @@ span.mediumgray {
 span.darkgray {
   background-color: #171515;
 }
-
-
-.teal {
-  background-color: #06a79f;
-}
-.green {
-  background-color: #89A54E;
-}
-.blue {
-  background-color: #3D96AE;
-}
-.purple {
-  background-color: #D882d8;
-}
-.yellow {
-  background-color: #ecec61;
-}
-.orange {
-  background-color: #f37676;
-}
-.red {
-  background-color: #AA4643;
-}
-.lightgray {
-  background-color: gray;
-}
-.mediumgray {
-  background-color: #403e3e;
-}
-.darkgray {
-  background-color: #171515;
-}

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

@@ -38,7 +38,7 @@ module Api
 
 	def create
 	  @device_interface = ::ForemanDatacenter::DeviceInterface.new(device_interface_params)
-          process_response @device_interface.save
+	  @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

@@ -47,7 +47,7 @@ module Api
 	param_group :device, :as => :create
 
 	def create
-	  @device = ::ForemanDatacenter::Device.new(device_params.merge(host_id: params[:host_id]))
+	  @device = ::ForemanDatacenter::Device.new(device_params.merge(hosy_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[]))
-          process_response @management_device.save
+	  @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

@@ -2,14 +2,14 @@ module Api
   module V2
     module ForemanDatacenter
       class PowerOutletsController < ForemanDatacenter::BaseController
-        include ::ForemanDatacenter::Controller::Parameters::PowerOutlet
+	include ::ForemanDatacenter::Controller::Parameters::PowerOutlet
 
         before_action :find_resource, :only => %w{show update destroy connect disconnect}
         add_scoped_search_description_for(::ForemanDatacenter::PowerOutletTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/power_outlets/", N_("List all PowerOutlets")
-
+        
         def index
           @power_outlets = resource_scope_for_index
         end
@@ -20,57 +20,57 @@ module Api
         def show
         end
 
-        def_param_group :power_outlet do
-          param :power_outlet, Hash, :required => true, :action_aware => true do
-            param :name, String, :required => true
-            param :device_id, :number, :desc => N_("Device ID")
-          end
-        end
+	def_param_group :power_outlet do
+	  param :power_outlet, Hash, :required => true, :action_aware => true do
+	    param :name, String, :required => true
+	    param :device_id, :number, :desc => N_("Device ID")
+	  end
+	end
 
-        api :POST, "/foreman_datacenter/power_outlets", N_("Create a PowerOutlet")
-        param_group :power_outlet, :as => :create
+	api :POST, "/foreman_datacenter/power_outlets", N_("Create a PowerOutlet")
+	param_group :power_outlet, :as => :create
 
-        def create
-          @power_outlet = ::ForemanDatacenter::PowerOutlet.new(power_outlet_params)
-          process_response @power_outlet.save
-        end
+	def create
+	  @power_outlet = ::ForemanDatacenter::PowerOutlet.new(power_outlet_params)
+	  @power_outlet.save
+	end
 
-        api :PUT, "/foreman_datacenter/power_outlets/:id/", N_("Update a PowerOutlet")
-        param :id, :identifier, :required => true
-        param_group :power_outlet
+	api :PUT, "/foreman_datacenter/power_outlets/:id/", N_("Update a PowerOutlet")
+	param :id, :identifier, :required => true
+	param_group :power_outlet
 
-        def update
-          process_response @power_outlet.update(power_outlet_params)
-        end
+	def update
+	  process_response @power_outlet.update(power_outlet_params)
+	end
 
-        api :DELETE, "/foreman_datacenter/power_outlets/:id/", N_("Delete a PowerOutlet")
-        param :id, :identifier, :required => true
+	api :DELETE, "/foreman_datacenter/power_outlets/:id/", N_("Delete a PowerOutlet")
+	param :id, :identifier, :required => true
 
-        def destroy
-          process_response @power_outlet.destroy
-        end
+	def destroy
+	  process_response @power_outlet.destroy
+	end
 
-        api :PATCH, "/foreman_datacenter/power_outlets/:id/connect", N_("Connect")
-        param :id, :identifier, :required => true
-        param_group :power_outlet
+	api :PATCH, "/foreman_datacenter/power_outlets/:id/connect", N_("Connect")
+	param :id, :identifier, :required => true
+	param_group :power_outlet
         param :console_server_port_id, :number, :desc => N_("ConsoleServerPort ID"), :required => true
         param :connection_status, :number, :desc => N_("Connections status"), :required => true
 
-        def connect
+	def connect
           power_port = ::ForemanDatacenter::PowerPort.find(params[:power_port_id])
           power_port.connect(
             @power_outlet,
             params[:connection_status]
           )
-        end
+	end
 
-        api :PATCH, "/foreman_datacenter/power_outlets/:id/disconnect", N_("Disconnect")
-        param :id, :identifier, :required => true
-        param_group :power_outlet
+	api :PATCH, "/foreman_datacenter/power_outlets/:id/disconnect", N_("Disconnect")
+	param :id, :identifier, :required => true
+	param_group :power_outlet
 
-        def disconnect
+	def disconnect
           process_response @power_outlet.power_port.disconnect
-        end
+	end
       end
     end
   end

data/app/controllers/concerns/foreman_datacenter/controller/parameters/comment.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::Comment
+  module ForemanDatacenter::Controller::Parameters::Comment
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_port.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsolePort
+  module ForemanDatacenter::Controller::Parameters::ConsolePort
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_port_template.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsolePortTemplate
+  module ForemanDatacenter::Controller::Parameters::ConsolePortTemplate
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_server_port.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsoleServerPort
+  module ForemanDatacenter::Controller::Parameters::ConsoleServerPort
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_server_port_template.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsoleServerPortTemplate
+  module ForemanDatacenter::Controller::Parameters::ConsoleServerPortTemplate
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_bay.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceBay
+  module ForemanDatacenter::Controller::Parameters::DeviceBay
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_bay_template.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceBayTemplate
+  module ForemanDatacenter::Controller::Parameters::DeviceBayTemplate
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_interface.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceInterface
+  module ForemanDatacenter::Controller::Parameters::DeviceInterface
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_interface_connection.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceInterfaceConnection
+  module ForemanDatacenter::Controller::Parameters::DeviceInterfaceConnection
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_module.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceModule
+  module ForemanDatacenter::Controller::Parameters::DeviceModule
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_role.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceRole
+  module ForemanDatacenter::Controller::Parameters::DeviceRole
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_type.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceType
+  module ForemanDatacenter::Controller::Parameters::DeviceType
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/foreman_datacenter/application_controller.rb

@@ -90,8 +90,6 @@ module ForemanDatacenter
           'populate'
         when 'move'
           'move'
-        when 'racks'
-          'racks'
         else
           super
       end

data/app/controllers/foreman_datacenter/console_ports_controller.rb

@@ -72,12 +72,14 @@ module ForemanDatacenter
         console_server_port,
         params[:console_port][:connection_status]
       )
-      process_success(success_msg: "Console port was successfully connected.", success_redirect: device_url(id: @console_port.device_id))
+      redirect_to device_url(id: @console_port.device_id),
+                  notice: 'Console port was successfully connected.'
     end
 
     def disconnect
       @console_port.disconnect
-      process_success(success_msg: "Console port was successfully disconnected.", success_redirect: device_url(id: @console_port.device_id))
+      redirect_to device_url(id: @console_port.device_id),
+                  notice: 'Console port was successfully disconnected.'
     end
   end
 end

data/app/controllers/foreman_datacenter/console_server_ports_controller.rb

@@ -18,7 +18,8 @@ module ForemanDatacenter
       @console_server_port = ForemanDatacenter::ConsoleServerPort.new(console_server_port_params.merge(device_id: params[:device_id]))
 
       if @console_server_port.save
-        process_success(success_msg: "Console server port was successfully created.", success_redirect: device_url(id: @console_server_port.device_id))
+        redirect_to device_url(id: @console_server_port.device_id),
+                    notice: 'Console server port was successfully created.'
       else
         process_error object: @console_server_port
       end
@@ -26,7 +27,8 @@ module ForemanDatacenter
 
     def update
       if @console_server_port.update(console_server_port_params)
-        process_success(success_msg: "Console server port was successfully updated.", success_redirect: device_url(id: @console_server_port.device_id))
+        redirect_to device_url(id: @console_server_port.device_id),
+                    notice: 'Console server port was successfully updated.'
       else
         process_error object: @console_server_port
       end
@@ -34,7 +36,8 @@ module ForemanDatacenter
 
     def destroy
       if @console_server_port.destroy
-        process_success(success_msg: "Console server port was successfully destroyed.", success_redirect: device_url(id: @console_server_port.device_id))
+        redirect_to device_url(id: @console_server_port.device_id),
+                    notice: 'Console server port was successfully destroyed.'
       else
         process_error object: @console_server_port
       end
@@ -49,12 +52,14 @@ module ForemanDatacenter
         @console_server_port,
         params[:console_port][:connection_status]
       )
-      process_success(success_msg: "Console server port was successfully connected.", success_redirect: device_url(id: @console_server_port.device_id))
+      redirect_to device_url(id: @console_server_port.device_id),
+                  notice: 'Console server port was successfully connected.'
     end
 
     def disconnect
       @console_server_port.console_port.disconnect
-      process_success(success_msg: "Console server port was successfully disconnected.", success_redirect: device_url(id: @console_server_port.device_id))
+      redirect_to device_url(id: @console_server_port.device_id),
+                  notice: 'Console server port was successfully disconnected.'
     end
 
     def for_device

data/app/controllers/foreman_datacenter/device_bays_controller.rb

@@ -17,7 +17,8 @@ module ForemanDatacenter
       @device_bay = ForemanDatacenter::DeviceBay.new(device_bay_params.merge(device_id: params[:device_id]))
 
       if @device_bay.save
-        process_success(success_msg: "New device bay was successfully created.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'New device bay was successfully created'
       else
         process_error object: @device_bay
       end
@@ -25,7 +26,8 @@ module ForemanDatacenter
 
     def update
       if @device_bay.update(device_bay_params)
-        process_success(success_msg: "Device bay was successfully updated.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully updated'
       else
         process_error object: @device_bay
       end
@@ -33,7 +35,8 @@ module ForemanDatacenter
 
     def destroy
       if @device_bay.destroy
-        process_success(success_msg: "Device bay was successfully destroyed.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully destroyed'
       else
         process_error object: @device_bay
       end
@@ -45,7 +48,8 @@ module ForemanDatacenter
     def populate
       device_id = params[:device_bay][:installed_device_id]
       if @device_bay.update(installed_device_id: device_id)
-        process_success(success_msg: "Device bay was successfully populated.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully populated'
       else
         process_error object: @device_bay
       end
@@ -53,7 +57,8 @@ module ForemanDatacenter
 
     def depopulate
       if @device_bay.update(installed_device_id: nil)
-        process_success(success_msg: "Device bay was successfully depopulated.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully depopulated'
       else
         process_error object: @device_bay
       end