foreman_resource_quota 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e395e2dfdbaf6a690ee47ed3885daa6d1bf02d66fa9ab4ddc9616214913e1bbe
-  data.tar.gz: c6804f4c3ac2245a891f54ddbec65b5736983466c05e18fedc3d0b6ff926c932
+  metadata.gz: 6f6916afed10f56a6e68d6dab6bc68441f75996422a6776927e7ef41abd35464
+  data.tar.gz: 4f8b5a6fb679a1ca0e1cfa4eced475b434ed59ca23d89aaa73c67002d6f9c0f8
 SHA512:
-  metadata.gz: 54de1fc3feda746af897c9161a3079f12e6e0be2ad9ef372ab39a9987cb86866fc7216bd5df13bcc477beb8ec8587be81bd95f858e65e05f034a22d78e88fa93
-  data.tar.gz: '09bf9301c5b261f83e5ca90d78ae0d38b1eff943c0c680d5c8fbd6eeca080f18c8e744f29a58f753b42f35c5c1bd52f04f0a1a562384ebdfa07dd96796cc31f0'
+  metadata.gz: 3bb2239f5e28ff78afcfd9cbf7e2a1808cb3b28fd97a1ce52ccf98cebb8e6ada88b5a814ca115b8844d8e526c97f68d6922849eea51efa6485c20ec92d1ea96c
+  data.tar.gz: 956efef81ed4f030dbdddef3abce948eefcb2502ab9e6e7cf4a27b518049ffd4afff3dc89330b2cd6adb6e69b6547ef0e3a4602cbb9527b4cf1d29c375c63f8e

data/app/models/concerns/foreman_resource_quota/user_extensions.rb

@@ -3,7 +3,7 @@
 module ForemanResourceQuota
   module UserExtensions
     extend ActiveSupport::Concern
-    included do
+    included do # rubocop:disable Metrics/BlockLength
       after_create :set_unassigned_quota
 
       has_many :resource_quotas_users, class_name: 'ForemanResourceQuota::ResourceQuotaUser', dependent: :destroy,
@@ -13,6 +13,15 @@ module ForemanResourceQuota
 
       scoped_search relation: :resource_quotas, on: :name, complete_value: true, rename: :resource_quota
 
+      def quotas_with_usergroups
+        quotas = []
+        usergroups.each do |group|
+          quotas << group.resource_quotas
+        end
+        quotas << resource_quotas
+        ForemanResourceQuota::ResourceQuota.where(id: quotas.flatten.map(&:id))
+      end
+
       def assignable_resource_quotas
         resource_quotas.assignable
       end

data/app/views/hosts/_form_quota_fields.html.erb

@@ -1,5 +1,5 @@
 <%
-  user_quotas = User.current&.admin? ? ForemanResourceQuota::ResourceQuota.all : User.current.resource_quotas.distinct
+  user_quotas = User.current&.admin? ? ForemanResourceQuota::ResourceQuota.all : User.current.quotas_with_usergroups
   user_quotas = user_quotas.assignable if !User.current.quota_assignment_optional?
   user_quotas = user_quotas.order(:name)
   selected = @host.resource_quota_id

data/lib/foreman_resource_quota/register.rb

@@ -107,10 +107,10 @@ Foreman::Plugin.register :foreman_resource_quota do
   end
   extend_page 'hosts/_list' do |context|
     context.with_profile :resource_quota, _('Resource Quota'), default: true do
-      add_pagelet :hosts_table_column_header, key: :resource_quota_id, label: s_('Resource Quota'),
+      add_pagelet :hosts_table_column_header, key: :resource_quota, label: s_('Resource Quota'),
         sortable: true, width: '10%', class: 'hidden-xs'
-      add_pagelet :hosts_table_column_content, key: :resource_quota_id,
-        callback: ->(host) { host.resource_quota.name }, class: 'hidden-xs ellipsis'
+      add_pagelet :hosts_table_column_content, key: :resource_quota,
+        callback: ->(host) { host.resource_quota&.name || _('Not available') }, class: 'hidden-xs ellipsis'
     end
   end
 end

data/lib/foreman_resource_quota/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanResourceQuota
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_resource_quota
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Bastian Schmidt
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Foreman Plug-in for resource quota
 test_files: []