foreman_expire_hosts 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51017605d1e78a328d639736c4fba5367f872ba
-  data.tar.gz: 00aaff59e5242156824203423ece81d2f213f415
+  metadata.gz: ffe7a9b12696e0e2f492abefc63a354e46533892
+  data.tar.gz: 8315d516b2a6863b51df48c111093f144f6ac8ec
 SHA512:
-  metadata.gz: a56ee4a45d47db3650f9e311a54c055fb200a84a7d6640f20532a8920660a42f39c47e702869174bf30a6462877a5583e6f5bdb5377e7f6637b51713afc20854
-  data.tar.gz: 50bea00b635d7fa753a43b81e1f6b8402d3f331fbaca61c7eb57c6add02e6f2287f143ccb7b50d61c1e74cd4d6055746f9c9eaa144fd1fe290618da7652a893a
+  metadata.gz: f4cf8b79e5763299dbb22939a3f4b1128a8ecf0f8ebdb99e0474b7fc1e467a36fbad0d32dd7bec6047f6aa07f3f21bdfe4d893f317ac128a7048257770bc5725
+  data.tar.gz: 1a64601384e3fff010888920bc3994db9d5ab0552b198d552f36e9f31a4d5065f1adfadc6e07343725e6bcac9e158dfb22e7c712a5743c25941ee10c3086af22

data/app/models/concerns/foreman_expire_hosts/host_ext.rb

@@ -72,7 +72,7 @@ module ForemanExpireHosts
       return true if new_record?
       return true if defined?(Rails::Console)
       return true unless User.current
-      return true if User.current.admin?
+      return true if Authorizer.new(User.current).can?(:edit_host_expiry, self)
       return true if self.owner_type.nil? || self.owner.nil?
       Setting[:can_owner_modify_host_expiry_date] &&
         ((self.owner_type == 'User' && self.owner == User.current) ||

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

@@ -14,7 +14,9 @@
            },
            :autocomplete => false,
            :placeholder  => 'dd/mm/yyyy',
-           :help_inline  => popover('Auto Expiry', 'Host will be deleted automatically on given expired date.
-            <br> Leave blank to keep the host until deleted manually'),
+           :help_block => ('<span class="pficon-warning-triangle-o"></span> '.html_safe + _('You are not allowed to change the expiry date of this host.') unless @host.can_modify_expiry_date?),
+           :readonly => !@host.can_modify_expiry_date?,
+           :help_inline  => popover('Auto Expiry', _('Host will be deleted automatically on given expiry date.') + '<br>'.html_safe +
+                                    _('Leave blank to keep the host until deleted manually')),
            :onfocus      => 'append_shortcuts()'
 %>

data/lib/foreman_expire_hosts/engine.rb

@@ -32,6 +32,12 @@ module ForemanExpireHosts
         security_block :hosts do
           permission :edit_hosts, {:hosts => [:select_multiple_expiration, :update_multiple_expiration]}
         end
+
+        security_block :foreman_expire_hosts do
+          permission :edit_host_expiry,
+                     {},
+                     :resource_type => 'Host'
+        end
       end
     end
 

data/lib/foreman_expire_hosts/version.rb

@@ -1,3 +1,3 @@
 module ForemanExpireHosts
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/test/unit/concerns/host_extensions_test.rb

@@ -66,6 +66,33 @@ class ForemanExpireHostsHostExtTest < ActiveSupport::TestCase
     end
   end
 
+  context 'changing expiration date for user' do
+    let(:host) { FactoryGirl.create(:host, :managed) }
+
+    context 'with edit_host_expiry permission' do
+      let(:permission) { Permission.find_by_name('edit_host_expiry') }
+      let(:filter) { FactoryGirl.create(:filter, :permissions => [permission]) }
+      let(:role) { FactoryGirl.create(:role, :filters => [filter]) }
+      let(:user) { FactoryGirl.create(:user, :organizations => [host.organization], :locations => [host.location], :roles => [role]) }
+
+      test 'user can change expiry date' do
+        as_user user do
+          assert_equal true, host.can_modify_expiry_date?
+        end
+      end
+    end
+
+    context 'without edit_host_expiry permission' do
+      let(:user) { FactoryGirl.build(:user, :organizations => [host.organization], :locations => [host.location]) }
+
+      test 'user can not change expiry date' do
+        as_user user do
+          assert_equal false, host.can_modify_expiry_date?
+        end
+      end
+    end
+  end
+
   context 'a host without expiration' do
     setup do
       @host = FactoryGirl.build(:host)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface