From 29a3b9231a699cf16e6d0cadbf591b8a55556d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Wed, 10 Jan 2024 10:27:26 +0100 Subject: [PATCH] Problem clicking action menu (three dots) in DMS file grid #1501 --- app/models/dmsf_file.rb | 4 +--- test/unit/dmsf_file_test.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 1faab4dd..0708c956 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -119,9 +119,7 @@ def self.findn_file_by_name(project_id, folder, name) end def approval_allowed_zero_minor - last_revision.minor_version.zero? if Setting.plugin_redmine_dmsf['only_approval_zero_minor_version'] - - true + Setting.plugin_redmine_dmsf['only_approval_zero_minor_version'] ? last_revision.minor_version&.zero? : true end def last_revision diff --git a/test/unit/dmsf_file_test.rb b/test/unit/dmsf_file_test.rb index 8d03e730..f6fea3ba 100644 --- a/test/unit/dmsf_file_test.rb +++ b/test/unit/dmsf_file_test.rb @@ -304,4 +304,22 @@ def test_copy_to_author assert f assert_equal @jsmith.id, f.last_revision.user_id, 'Author must be updated when copying' end + + def test_approval_allowed_zero_minor_yes + with_settings plugin_redmine_dmsf: { 'only_approval_zero_minor_version' => true } do + @file1.last_revision.minor_version = 0 + assert @file1.approval_allowed_zero_minor + @file1.last_revision.minor_version = 1 + assert_not @file1.approval_allowed_zero_minor + end + end + + def test_approval_allowed_zero_minor_no + with_settings plugin_redmine_dmsf: { 'only_approval_zero_minor_version' => nil } do + @file1.last_revision.minor_version = 0 + assert @file1.approval_allowed_zero_minor + @file1.last_revision.minor_version = 1 + assert @file1.approval_allowed_zero_minor + end + end end