rails_workflow 0.3.4 → 0.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/concerns/rails_workflow/operation_templates/dependencies.rb +3 -2
- data/app/concerns/rails_workflow/process_templates/default_builder.rb +0 -5
- data/app/concerns/rails_workflow/processes/default_runner.rb +0 -2
- data/app/controllers/rails_workflow/application_controller.rb +2 -1
- data/app/controllers/rails_workflow/errors_controller.rb +1 -1
- data/app/controllers/rails_workflow/operation_templates_controller.rb +1 -1
- data/app/controllers/rails_workflow/operations_controller.rb +1 -1
- data/app/controllers/rails_workflow/process_templates_controller.rb +1 -1
- data/app/controllers/rails_workflow/processes_controller.rb +7 -9
- data/app/decorators/rails_workflow/process_decorator.rb +1 -1
- data/app/serializers/rails_workflow/operation_template_serializer.rb +2 -1
- data/lib/rails_workflow/version.rb +1 -1
- data/spec/controllers/rails_workflow/operation_templates_controller_spec.rb +1 -4
- data/spec/dummy/log/development.log +2213 -0
- data/spec/dummy/log/test.log +22669 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/0EIKn8sY_0M0E7Li-YyoTYGMuWkMSlAlIFc7Qnb2ioI.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/1bDPFQYYoZ92zSB_1Yewvj1RrGqNGHrTLYXW0V5XGcY.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/20ilgUZBVBBqe9X9yp-ZnBBYybYzf3WTT2Qc3CS1QYk.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/3eNq8255nIx-uwNAqFfLBPGF_zcuaYmk1qLTzqdxLPY.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/4fqYILPb73PNefY634gFdl-4gm7T1xyVcQ32PzXvVtk.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/6SeOOkcKtXeaRgTA0bueQfwnws83WblhkTNvJtwuQyo.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/86AMcjHILhoW6Ydej6dJPi-AtDF33ET69o8FBWHA5eM.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/8Cc6PiprSk320Kyt7hGbHAzummWpCiPCJ4c1kaH_o1I.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/8cROEJzplYgaGRvO8FMhFa7NGr-X4rOQowoNRr7QkCA.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/BlL8se8iF_xGaHvIROyx4hjI0Giv1vnxRMTqA7Ie6Ng.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/Bz2_G0w_AedgWd4KAS8TaIJx26bHtMTr7dMSTOG_XWo.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/CbqzastumiJfEyKEW6YCj6JHTDZtPsP1CIWCyEbw3Y8.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/Gn-Obq1PaNoJjfbeHqV1mmsxYof67dxMJzt-7KWCA48.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/H8B55t5wL8VTMMrw5mOHFSjEaYKkN1D9PMoKe3R0RYI.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/J5y6U_3pN2siipybKlQFMozxDhP0b7fM88TYcU-uVP0.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/LFykY_atMVKC5n5kEBGnC1S-zmDH0j3k1B0OfGNjeb4.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/NCN9IvNwAmJKd3TnY4CzigYxWVwYFCYQZLq3iXPdSRo.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/P24OOGIKNWibs9oMyl8TYRfavh-iXgT7OJzEJ6qWPK4.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/WDbX-T1fI0qdGGAalYwtkmbYOKeUrY1cUQxGHktQyZ8.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/WE-Id74AVZ-7gUSLvkm5fTQZTSaVBq0k9wNaPEv3qgs.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/XFpOHF6eXEOAuXiTzjRDDbP48USilJXWhZyu93BoJ_A.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/ZKL-sXqpVAOPK_7OF0YQwjPkkQr5Yn4DyQsMufSGpqA.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/ZOL8FGuGNTpvNUUsSzMT5ahd7SH4DroHx3SrklW4Kkg.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/aThz_jb-IMJe0wKDIb43M-V9k4LRwJEWoQhBbM8JarQ.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/cKrqNnKq1ljj0sfPALg0Km14OlVBYh5XkCh4w9aTtrY.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/dmShfTrLpoxmBamKyX718Fxhn4R668mOU-eWYM_71OE.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/gOedOIKQuejVG-daR98iyzkOBEG-z8LWwqFLpNpLF4M.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/isc6UFf-rgvcpTogrWLXYRSLSGvPFKpnUHgCc0qA7Eg.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/izr8yqsAK6K92dIGZRKuDiMiZx4ck5SLfH2r2p6FKDc.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kmcu5qEA6xe0TX6L8NknEZxfdRTNXlcChNcz7-pBhWw.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/lF4IvO444Hc3QiPnrN47SDVxtvAaMSk6Bvco29gd3GA.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/m_KoMFPYzMsgBl6U9ks26UHmvQWIfpSaOS7Vz18VY-M.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/meUAmvZ36ls8PVDaQIIP0uhq8kTgyu4Xa1psCfXaV6k.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/nHTym1XaEZcCX8euPzYoN9Z4oSFlsxfj5tcOkmC9FjE.cache +3 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/nfSVuvwgMu1JkhcJ3PHzcwo0dji6jxOS9ajEh_gFCEM.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/oD5Ypm1kW3mrhrVFsYB7MbyWZ_RqxHR7br1kOkw62zw.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/q2dXQx2au72ieiBBglM2a1HlZnIy3O2ZJglcK1Xbfz4.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/qPoe31z0TY8Pb49hlAPrvvt0fL8TRKkrb0hqWrCVNGM.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/rPmABz0raf_Mu_97pCTl8Uya3_-Jhe4A2SkK-nd8bVQ.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/rf5Isz_x5fsKXcFFa5fhiiuv82UJ4KmXMgmIHuzUm6Y.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/t8PCA45QoCYfmSt9aAT4yoKvBwtzMCt6Dz3Ats0PO2E.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/vGnU6GewlO_EFds1nYQMWRajunwbiEru9AIXNDF80So.cache +1 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/wSKJsFrEwRNsNE695snJr0DrCLo12W8YnJdsJeWiS9w.cache +4 -0
- data/spec/models/rails_workflow/operation_template_spec.rb +2 -20
- metadata +64 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 13578e628767e17f817b949ec491a1a8250aebf4
|
4
|
+
data.tar.gz: b645cb6885642e653d733e7abba06a9b212b2eea
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bbc6cd94c1709f3ccd551ec2dae71a0f3ffc0083ff21ae5ba602debbeb664b9b32c4190e6f41ce29d3443a65b8d629dcb01b2de930bdd581a605ff59e9e913fd
|
7
|
+
data.tar.gz: eb2b961eae1310f9d06080c9ab163a6b0eb3000d20f431c12c5cb5ac9c47e63707db3361efb003fea4f69ffd854ede0ce1ea22a85a94665c6dcf214240887220
|
@@ -16,10 +16,11 @@ module RailsWorkflow
|
|
16
16
|
extend ActiveSupport::Concern
|
17
17
|
|
18
18
|
included do
|
19
|
-
scope :independent_only, -> { where(dependencies: nil.to_json) }
|
20
|
-
|
21
19
|
serialize :dependencies, JSON
|
22
20
|
|
21
|
+
# dependeing on serialize / rails version it may save null value or 'null' value
|
22
|
+
scope :independent_only, -> { where("dependencies is null or dependencies = 'null' or dependencies='[]'") }
|
23
|
+
|
23
24
|
def resolve_dependency operation
|
24
25
|
true
|
25
26
|
end
|
@@ -13,8 +13,6 @@ module RailsWorkflow
|
|
13
13
|
extend ActiveSupport::Concern
|
14
14
|
|
15
15
|
included do
|
16
|
-
|
17
|
-
|
18
16
|
def build_process! context
|
19
17
|
process = process_class.create template: self
|
20
18
|
|
@@ -23,10 +21,7 @@ module RailsWorkflow
|
|
23
21
|
process.create_context(data: context, parent: process)
|
24
22
|
|
25
23
|
build_independent_operations process
|
26
|
-
process.reload
|
27
|
-
build_process(process) if respond_to? :build_process
|
28
24
|
process
|
29
|
-
|
30
25
|
end
|
31
26
|
|
32
27
|
end
|
@@ -1,10 +1,11 @@
|
|
1
1
|
module RailsWorkflow
|
2
|
-
class ApplicationController <
|
2
|
+
class ApplicationController < ::ApplicationController
|
3
3
|
before_filter only: [:index, :show, :edit] do
|
4
4
|
RailsWorkflow::OperationTemplate.inheritance_column = nil
|
5
5
|
RailsWorkflow::Operation.inheritance_column = nil
|
6
6
|
RailsWorkflow::ProcessTemplate.inheritance_column = nil
|
7
7
|
end
|
8
8
|
|
9
|
+
# before_action :authenticate_user!
|
9
10
|
end
|
10
11
|
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
module RailsWorkflow
|
2
|
-
class OperationTemplatesController <
|
2
|
+
class OperationTemplatesController < ApplicationController
|
3
3
|
layout 'rails_workflow/application'
|
4
4
|
before_action :set_operation_template, only: [:show, :edit, :update, :destroy]
|
5
5
|
before_action :set_process_template
|
@@ -1,5 +1,5 @@
|
|
1
1
|
module RailsWorkflow
|
2
|
-
class ProcessesController <
|
2
|
+
class ProcessesController < ApplicationController
|
3
3
|
layout 'rails_workflow/application'
|
4
4
|
respond_to :html
|
5
5
|
before_action :set_process, only: [:show, :edit, :update, :destroy]
|
@@ -69,16 +69,14 @@ module RailsWorkflow
|
|
69
69
|
end
|
70
70
|
|
71
71
|
def undecorated_collection
|
72
|
+
collection_scope = Process.default_scoped
|
72
73
|
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
collection_scope = collection_scope.by_status(status)
|
78
|
-
end
|
79
|
-
|
80
|
-
collection_scope.paginate(page: params[:page]).order(created_at: :desc)
|
74
|
+
if params[:filter]
|
75
|
+
status = Process.get_status_code(params[:filter]['status'])
|
76
|
+
collection_scope = collection_scope.by_status(status)
|
77
|
+
end
|
81
78
|
|
79
|
+
collection_scope.paginate(page: params[:page]).order(id: :asc)
|
82
80
|
end
|
83
81
|
|
84
82
|
|
@@ -4,7 +4,8 @@ module RailsWorkflow
|
|
4
4
|
:async, :assignment_id, :assignment_type, :kind, :role, :group, :instruction,
|
5
5
|
:is_background, :type, :partial_name, :version, :tag
|
6
6
|
|
7
|
-
|
7
|
+
# todo add child_process search by guid
|
8
|
+
# has_one :child_process, serializer: RailsWorkflow::ProcessTemplateSerializer
|
8
9
|
|
9
10
|
def dependencies
|
10
11
|
object.dependencies.each do |d|
|
@@ -86,10 +86,7 @@ module RailsWorkflow
|
|
86
86
|
process_template_id: @template.id,
|
87
87
|
operation_template: valid_attributes
|
88
88
|
}, valid_session, use_route: :workflow
|
89
|
-
}.to change(
|
90
|
-
|
91
|
-
last_operation = OperationTemplate.last
|
92
|
-
expect(last_operation).to be_instance_of(RailsWorkflow::CustomOperationTemplate)
|
89
|
+
}.to change(RailsWorkflow::CustomOperationTemplate, :count).by(1)
|
93
90
|
end
|
94
91
|
|
95
92
|
it "assigns a newly created operation_template as @operation_template" do
|