foreman-tasks 0.2.0 → 0.2.1

data/app/lib/actions/helpers/humanizer.rb

@@ -43,13 +43,15 @@ module Actions
          link: link_to_resource(type, data, other_data) }
       end
 
+      # TODO: this probably is not the best place for this logic, find
+      # out where to put this
       def link_to_resource(type, data, other_data)
         case type
         when :product
-          "#/products/#{data[:cp_id]}/info" if data[:cp_id]
+          "#/products/#{data[:id]}/info" if data[:id]
         when :repository
-          if other_data[:product] && other_data[:product][:cp_id] && data[:id]
-            "#/products/#{other_data[:product][:cp_id]}/repositories/#{data[:id]}"
+          if other_data[:product] && other_data[:product][:id] && data[:id]
+            "#/products/#{other_data[:product][:id]}/repositories/#{data[:id]}"
           end
         when :system
           if data[:uuid]
@@ -57,7 +59,7 @@ module Actions
           end
         when :organization
           if data[:label]
-            "/katello/organizations#/!=&panel=organization_#{data[:label]}&!="
+            "/organizations/#{data[:id]}/edit"
           end
         end
       end

data/lib/foreman_tasks/dynflow/configuration.rb

@@ -19,10 +19,6 @@ module ForemanTasks
     # between this process and the external executor
     attr_accessor :remote_socket_path
 
-    # what persistence adapater should be used, by default, it uses Sequlel
-    # adapter based on Rails app database.yml configuration
-    attr_accessor :persistence_adapter
-
     # what transaction adapater should be used, by default, it uses the ActiveRecord
     # based adapter, expecting ActiveRecord is used as ORM in the application
     attr_accessor :transaction_adapter
@@ -37,7 +33,6 @@ module ForemanTasks
       self.pool_size           = 5
       self.remote              = Rails.env.production?
       self.remote_socket_path  = File.join(Rails.root, "tmp", "sockets", "dynflow_socket")
-      self.persistence_adapter = default_persistence_adapter
       self.transaction_adapter = ::Dynflow::TransactionAdapters::ActiveRecord.new
       self.eager_load_paths    = []
       self.lazy_initialization = !Rails.env.production?
@@ -59,15 +54,11 @@ module ForemanTasks
     def world_options
       { logger_adapter:      ::Dynflow::LoggerAdapters::Delegator.new(action_logger, dynflow_logger),
         pool_size:           5,
-        persistence_adapter: persistence_adapter,
+        persistence_adapter: initialize_persistence,
         transaction_adapter: transaction_adapter,
         executor:            -> world { initialize_executor world } }
     end
 
-    def default_persistence_adapter
-      ForemanTasks::Dynflow::Persistence.new(default_sequel_adapter_options)
-    end
-
     def default_sequel_adapter_options
       db_config            = ActiveRecord::Base.configurations[Rails.env].dup
       db_config['adapter'] = 'postgres' if db_config['adapter'] == 'postgresql'
@@ -91,5 +82,10 @@ module ForemanTasks
         ::Dynflow::Executors::Parallel.new(world, self.pool_size)
       end
     end
+
+    # Sequel adapter based on Rails app database.yml configuration
+    def initialize_persistence
+      ForemanTasks::Dynflow::Persistence.new(default_sequel_adapter_options)
+    end
   end
 end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails