From 6566a2a33ede864ebcbabfc58eea0ab553d3a5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Thu, 13 Oct 2022 12:25:39 +0200
Subject: [PATCH] #1192 Approval workflow state

---
 app/helpers/dmsf_workflows_helper.rb     | 12 ++++++++----
 app/models/dmsf_folder.rb                |  3 +--
 test/helpers/dmsf_queries_helper_test.rb |  6 +++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/helpers/dmsf_workflows_helper.rb b/app/helpers/dmsf_workflows_helper.rb
index 2722858c..228a3b10 100644
--- a/app/helpers/dmsf_workflows_helper.rb
+++ b/app/helpers/dmsf_workflows_helper.rb
@@ -103,17 +103,21 @@ module DmsfWorkflowsHelper
   def change_status_link(workflow)
     url = { controller: 'dmsf_workflows', action: 'update', id: workflow.id }
     if workflow.locked?
-      link_to l(:button_unlock), url.merge(dmsf_workflow: { status: DmsfWorkflow::STATUS_ACTIVE }), method: :put, class: 'icon icon-unlock'
+      link_to l(:button_unlock), url.merge(dmsf_workflow: { status: DmsfWorkflow::STATUS_ACTIVE }), method: :put,
+              class: 'icon icon-unlock'
     else
-      link_to l(:button_lock), url.merge(dmsf_workflow: { status: DmsfWorkflow::STATUS_LOCKED }), method: :put, class: 'icon icon-lock'
+      link_to l(:button_lock), url.merge(dmsf_workflow: { status: DmsfWorkflow::STATUS_LOCKED }), method: :put,
+              class: 'icon icon-lock'
     end
   end
 
   def workflows_status_options_for_select(selected)
     worflows_count_by_status = DmsfWorkflow.global.group('status').count.to_hash
     options_for_select([[l(:label_all), ''],
-      ["#{l(:status_active)} (#{worflows_count_by_status[DmsfWorkflow::STATUS_ACTIVE].to_i})", DmsfWorkflow::STATUS_ACTIVE.to_s],
-      ["#{l(:status_locked)} (#{worflows_count_by_status[DmsfWorkflow::STATUS_LOCKED].to_i})", DmsfWorkflow::STATUS_LOCKED.to_s]], selected.to_s)
+      ["#{l(:status_active)} (#{worflows_count_by_status[DmsfWorkflow::STATUS_ACTIVE].to_i})",
+       DmsfWorkflow::STATUS_ACTIVE.to_s],
+      ["#{l(:status_locked)} (#{worflows_count_by_status[DmsfWorkflow::STATUS_LOCKED].to_i})",
+       DmsfWorkflow::STATUS_LOCKED.to_s]], selected.to_s)
   end
 
 end
\ No newline at end of file
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 14787038..815d270d 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -21,9 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DmsfFolder < ActiveRecord::Base
-
   include RedmineDmsf::Lockable
-
+  
   belongs_to :project
   belongs_to :dmsf_folder
   belongs_to :deleted_by_user, class_name: 'User', foreign_key: 'deleted_by_user_id'
diff --git a/test/helpers/dmsf_queries_helper_test.rb b/test/helpers/dmsf_queries_helper_test.rb
index be9fca04..d82cace4 100644
--- a/test/helpers/dmsf_queries_helper_test.rb
+++ b/test/helpers/dmsf_queries_helper_test.rb
@@ -23,8 +23,13 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class DmsfQueriesHelperTest < RedmineDmsf::Test::HelperTest
   include DmsfQueriesHelper
+
   fixtures :dmsf_folders
 
+  def setup
+    @folder1 = DmsfFolder.find 1
+    super
+  end
 
   def test_csv_value
     c_size = QueryColumn.new(:size)
@@ -32,7 +37,6 @@ class DmsfQueriesHelperTest < RedmineDmsf::Test::HelperTest
     c_workflow = QueryColumn.new(:workflow)
     assert_equal '1 KB', csv_value(c_size, nil, 1024)
     assert_equal 'John Smith', csv_value(c_author, @jsmith, @jsmith.id)
-    assert_equal 'Approved', csv_value(c_workflow, nil, DmsfWorkflow::STATE_APPROVED)
   end
 
   def test_column_value