rails_workflow 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdceaf61577d25aa9f96f6ecb137b324b4285e9f
-  data.tar.gz: c8d565433000b1e4865c779ed916dc2d55b29bc2
+  metadata.gz: 1d85d2776fc4b5bc25da7f7555318ad088641307
+  data.tar.gz: 3f7d947d513ec8f4431829329432ca38ec97296d
 SHA512:
-  metadata.gz: 88dd3bf227a6548932d3c0fd623e987739bea36070a04ff95361e7763e274e24ed12c0cab520b3986df45a5c220eb0c821c39e178754a3104b230f58f26b7ddf
-  data.tar.gz: fac3080b6f6d846f8d48a8bd2cd4f6ab514352c87469b7d1423c2646378d013b79341e6ed7f18a6edf01799bba1904fecc894c8349804461dff44e375769a8eb
+  metadata.gz: c8c2b93714080e1ccdf5d687aa4fde94b42d0cca08eac931217d44971439793c421b5d52787a81b46aed66b60e672400be7993aa987ec74d47acbf82494237ef
+  data.tar.gz: 2871b11611017711cfefba38526fefb1dee5bfe06eaa4a269aa333b8bab6824ed9196d8760b71d90c8808ab71a6bf6331e5d3c5c96284287c23f3c347c7617cd

data/app/controllers/rails_workflow/operation_templates_controller.rb

@@ -44,6 +44,7 @@ module RailsWorkflow
           operation_template: [
             :kind,
             :type,
+            :tag,
             :instruction,
             :title, :source,
             :child_process_id,

data/app/decorators/rails_workflow/operation_helper_decorator.rb

@@ -3,17 +3,24 @@
 module RailsWorkflow
   class OperationHelperDecorator < Decorator
     include StatusDecorator
-    delegate :id, :title, :instruction, :complete
+    delegate :id, :title, :tag, :instruction, :complete, :data
 
     def assigned_to
       object.assignment.try(:email) || begin
         [
-          ::User.role_text(object.role),
-          ::User.group_text(object.group)
+          assignment_by_role, assignment_by_group
         ].compact.join(', ')
       end
     end
 
+    def assignment_by_role
+      ::User.role_text(object.role) if object.role
+    end
+
+    def assignment_by_group
+      ::User.group_text(object.group) if object.group
+    end
+
     def created_at
       object.created_at.strftime('%m/%d/%Y %H:%M')
     end

data/app/decorators/rails_workflow/operation_template_decorator.rb

@@ -42,15 +42,15 @@ module RailsWorkflow
     end
 
     def assignment
-      [assignment_by_role, assignemt_by_group].compact.join(', ')
+      [assignment_by_role, assignment_by_group].compact.join(', ')
     end
 
     def assignment_by_role
-      User.role_text(object.role) if object.role
+      ::User.role_text(object.role) if object.role
     end
 
-    def assignemt_by_group
-      User.group_text(object.group) if object.group
+    def assignment_by_group
+      ::User.group_text(object.group) if object.group
     end
 
     def show_dependencies

data/app/models/rails_workflow/operation.rb

@@ -28,6 +28,10 @@ module RailsWorkflow
       template.instruction
     end
 
+    def tag
+      read_attribute(:tag) || template.tag
+    end
+
     def manager
       @manager ||= process.manager
     end

data/app/views/rails_workflow/operation_templates/_user_form.html.slim

@@ -0,0 +1,58 @@
+- if @operation_template.errors.any?
+  #error_explanation
+    h2 = "#{pluralize(@operation_template.errors.count, "error")} prohibited this wf_operation_template from being saved:"
+    ul
+      - @operation_template.errors.full_messages.each do |message|
+        li = message
+
+= hidden_field_tag 'operation_template[kind]', @operation_template.kind
+
+.form-group
+  = f.label :title, class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :title, class: "form-control"
+
+
+.form-group
+  = f.label :operation_class, class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :operation_class, class: "form-control", placeholder: f.object.default_class
+
+.form-group
+  = f.label :type, "Template Class", class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :type, class: "form-control", placeholder: f.object.default_type
+
+.form-group
+  = f.label :partial_name, "Context Partial", class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :partial_name, class: "form-control", placeholder: "Default"
+
+.form-group
+  = f.label :tag, "Operation Tag", class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :tag, class: "form-control"
+
+
+.form-group
+  = f.label :child_process, class: "control-label col-sm-2"
+  .col-sm-10
+    = f.collection_select(:child_process_id, @process_template.other_processes, :id, :title, {include_blank: true}, { class: "form-control" })
+
+.checkbox
+  .col-sm-2
+  .col-sm-10
+    label
+      = f.check_box :async
+      | Asynchronous
+      br
+      br
+
+.checkbox
+  .col-sm-2
+  .col-sm-10
+    label
+      = f.check_box :is_background
+      | Run in background
+      br
+      br

data/lib/rails_workflow/config.rb

@@ -128,9 +128,13 @@ module RailsWorkflow
     private
 
     def init_default_operation_types
+      # TODO: it should allow user_role and user_group operations
+      # only if user responds to necessary methods.
       @default_operation_types = {
         default:    { title: 'Default Operation',
                       class: 'RailsWorkflow::Operation' },
+        user:       { title: 'User Operation',
+                      class: 'RailsWorkflow::UserOperation' },
         user_role:  { title: 'Operation for User By Role',
                       class: 'RailsWorkflow::UserByRoleOperation' },
         user_group: { title: 'Operation by User Group',

data/lib/rails_workflow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsWorkflow
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_workflow
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Maxim Madzhuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -233,6 +233,7 @@ files:
 - app/views/application/_flash.html.slim
 - app/views/layouts/rails_workflow/application.html.slim
 - app/views/rails_workflow/operation_templates/_default_form.html.slim
+- app/views/rails_workflow/operation_templates/_user_form.html.slim
 - app/views/rails_workflow/operation_templates/_user_group_form.html.slim
 - app/views/rails_workflow/operation_templates/_user_role_form.html.slim
 - app/views/rails_workflow/operation_templates/edit.html.slim