foreman_virt_who_configure 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '00828a04059a2127b00c406050e482d09a14c42a'
-  data.tar.gz: cd043f391d7311cc3daf7dd63b8be65740c155c8
+  metadata.gz: 2b47a2020307dc453ed4b12012eb386bb82b4053
+  data.tar.gz: fa463aa1e278c5af50b1429bda158e25e0fbd7bf
 SHA512:
-  metadata.gz: 72adb1410ffe0227b945b1d317992dda1d7d11a974f7dbdaeaca092ef9bc1787b6b02b8045dd507098b3587cbdf8c5a02260eeddb52806ce086087e36202d29a
-  data.tar.gz: 78ae37c6993a476425536300217098bf06e4c81fa6b238f43e1703277f8a9c345287bf7b9919701bc50808b3d449c3bbb9271f71c3ff5b3bd8df3e3ba84ac0ed
+  metadata.gz: e366d45ad3a8f7cc2102787e23d013a1f27fd165dcc69c3fd15bea4f8bb83978b125b331808aeb670795ef3f360aaddb2c2782a85d8ccf3c3f01991de8dcdee6
+  data.tar.gz: 5ae7f7599c8273cd49eb3f41e3e2bd29c8aa66dedfe15ef3ef9554b19d83b29588514321ef9542410b7c74e20212d818b38b829de6e57300414a2fbb020cccfa

data/app/controllers/foreman_virt_who_configure/api/v2/configs_controller.rb

@@ -92,6 +92,10 @@ module ForemanVirtWhoConfigure
 
         protected
 
+        def controller_permission
+          'virt_who_config'
+        end
+
         def action_permission
           case params[:action]
             when 'deploy_script'

data/app/controllers/foreman_virt_who_configure/configs_controller.rb

@@ -85,6 +85,10 @@ module ForemanVirtWhoConfigure
       end
     end
 
+    def controller_permission
+      'virt_who_config'
+    end
+
     private
 
     def apply_organization_filter(scope)

data/app/helpers/foreman_virt_who_configure/compatibility_helper.rb

@@ -4,9 +4,9 @@ module ForemanVirtWhoConfigure
 
     def new_config_link(options = {}, html_options = {})
       if ApplicationHelper.instance_methods.include?(:new_link)
-        new_link(_("Create Config"), options, html_options)
+        new_link(_("Create Config"), options.merge(:permission => 'create_virt_who_config'), html_options)
       else
-        display_link_if_authorized(_("New Config"), hash_for_new_foreman_virt_who_configure_config_path, html_options)
+        display_link_if_authorized(_("New Config"), hash_for_new_foreman_virt_who_configure_config_path.merge(:permission => 'create_virt_who_config'), html_options)
       end
     end
 

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -47,7 +47,7 @@ module ForemanVirtWhoConfigure
 
     def virt_who_output(format = nil)
       result = ''
-      result += "#!/usr/bin/bash\n" if format == :bash_script
+      result += "#!/bin/bash\n" if format == :bash_script
       result += <<EOS
 heading() {
   echo -e "\\n== $1 =="

data/app/services/foreman_virt_who_configure/cleaner.rb

@@ -0,0 +1,21 @@
+module ForemanVirtWhoConfigure
+  class Cleaner
+    def clean_up!
+      User.as_anonymous_admin do
+        remove_configurations
+        remove_hidden_auth_sources
+      end
+    end
+
+    private
+
+    def remove_hidden_auth_sources
+      AuthSourceHiddenWithAuthentication.destroy_all
+    end
+
+    # also removes service users
+    def remove_configurations
+      Config.destroy_all
+    end
+  end
+end

data/app/views/foreman_virt_who_configure/configs/index.html.erb

@@ -14,12 +14,12 @@
   <tbody>
     <% @configs.each do |config| %>
     <tr>
-      <td class="display-two-pane ellipsis"><%= link_to_if_authorized config.name, hash_for_foreman_virt_who_configure_config_path(:id => config).merge(:auth_object => config, :authorizer => authorizer) %></td>
+      <td class="display-two-pane ellipsis"><%= link_to_if_authorized config.name, hash_for_foreman_virt_who_configure_config_path(:id => config).merge(:auth_object => config, :authorizer => authorizer, :permission => 'view_virt_who_config') %></td>
       <td><%= config.humanized_interval %></td>
       <td><%= config_report_status(config) %></td>
       <td class="col-md-1"><%= action_buttons(
-                                   display_link_if_authorized(_('Edit'), hash_for_edit_foreman_virt_who_configure_config_path(:id => config).merge(:auth_object => config, :authorizer => authorizer)),
-                                   display_delete_if_authorized((hash_for_foreman_virt_who_configure_config_path(:id => config).merge(:auth_object => config, :authorizer => authorizer)), :data => { :confirm => _("Delete virt-who configuration %s?") % config.name })
+                                   display_link_if_authorized(_('Edit'), hash_for_edit_foreman_virt_who_configure_config_path(:id => config).merge(:auth_object => config, :authorizer => authorizer, :permission => 'edit_virt_who_config')),
+                                   display_delete_if_authorized((hash_for_foreman_virt_who_configure_config_path(:id => config).merge(:auth_object => config, :authorizer => authorizer, :permission => 'destroy_virt_who_config')), :data => {:confirm => _("Delete virt-who configuration %s?") % config.name})
                                ) %></td>
       </tr>
     <% end %>

data/app/views/foreman_virt_who_configure/configs/show.html.erb

@@ -13,7 +13,7 @@
       <div class="col-md-2">
         <div class="pull-right">
           <p>
-            <%= link_to _('Edit this configuration'), edit_foreman_virt_who_configure_config_path(@config), :class => 'btn btn-default' %>
+            <%= display_link_if_authorized _('Edit this configuration'), hash_for_edit_foreman_virt_who_configure_config_path(@config).merge(:permission => 'show_virt_who_config', :auth_object => @config), :class => 'btn btn-default' %>
           </p>
         </div>
       </div>

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

data/lib/tasks/foreman_virt_who_configure_tasks.rake

@@ -2,11 +2,9 @@ require 'rake/testtask'
 
 # Tasks
 namespace :foreman_virt_who_configure do
-  namespace :example do
-    desc 'Example Task'
-    task task: :environment do
-      # Task goes here
-    end
+  desc 'Clean default data created by this plugin, this will permanently delete the data!' 
+  task cleanup: :environment do
+    ForemanVirtWhoConfigure::Cleaner.new.clean_up!
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Foreman virt-who-configure team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -76,6 +76,7 @@ files:
 - app/models/foreman_virt_who_configure/config.rb
 - app/models/foreman_virt_who_configure/output_generator.rb
 - app/models/foreman_virt_who_configure/service_user.rb
+- app/services/foreman_virt_who_configure/cleaner.rb
 - app/services/sso/basic_with_hidden.rb
 - app/views/dashboard/_foreman_virt_who_configs_status_widget.html.erb
 - app/views/foreman_virt_who_configure/api/v2/configs/base.json.rabl