From aac3193c20f5a2fd4627850221f286392d8af77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Thu, 24 May 2018 14:13:36 +0200
Subject: [PATCH] Integrational test MySQL X Postgres

---
 app/models/dmsf_folder.rb                         |  4 ++--
 test/integration/rest_api/dmsf_folder_api_test.rb | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 292aa9b4..e0a5e446 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -58,9 +58,9 @@ class DmsfFolder < ActiveRecord::Base
         group_ids = -1 if group_ids.blank?
         allowed = (system && role.allowed_to?(:display_system_folders)) ? 1 : 0
         %{
-          (#{permissions}.object_id IS NULL) OR
+          ((#{permissions}.object_id IS NULL) OR
           (#{permissions}.object_id = #{role.id} AND #{permissions}.object_type = 'Role') OR
-          ((#{permissions}.object_id = #{user.id} OR #{permissions}.object_id IN (#{group_ids})) AND #{permissions}.object_type = 'User') AND
+          ((#{permissions}.object_id = #{user.id} OR #{permissions}.object_id IN (#{group_ids})) AND #{permissions}.object_type = 'User')) AND
           (#{folders}.system = #{DmsfFolder.connection.quoted_false} OR 1 = #{allowed})
         }
       else
diff --git a/test/integration/rest_api/dmsf_folder_api_test.rb b/test/integration/rest_api/dmsf_folder_api_test.rb
index 8d28a6bb..24a691c3 100644
--- a/test/integration/rest_api/dmsf_folder_api_test.rb
+++ b/test/integration/rest_api/dmsf_folder_api_test.rb
@@ -32,7 +32,7 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     @jsmith = User.find_by_id 2
     @file1 = DmsfFile.find_by_id 1
     @folder1 = DmsfFolder.find_by_id 1
-    @folder6 = DmsfFolder.find_by_id 6
+    @folder7 = DmsfFolder.find_by_id 7
     Setting.rest_api_enabled = '1'
     @role = Role.find_by_id 1
     @project1 = Project.find_by_id 1
@@ -43,7 +43,7 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     assert_kind_of User, @admin
     assert_kind_of User, @jsmith
     assert_kind_of DmsfFolder, @folder1
-    assert_kind_of DmsfFolder, @folder6
+    assert_kind_of DmsfFolder, @folder7
     assert_kind_of DmsfFile, @file1
     assert_kind_of Role, @role
     assert_kind_of Project, @project1
@@ -110,8 +110,8 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     #   <dmsf>
     #     <dmsf_folders total_count="1" type="array">
     #       <folder>
-    #       <id>6</id>
-    #         <title>folder6</title>
+    #       <id>7</id>
+    #         <title>folder7</title>
     #       </folder>
     #     </dmsf_folders>
     #     <dmsf_files total_count="1" type="array">
@@ -123,9 +123,10 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     #     <dmsf_links total_count="0" type="array">
     #     </dmsf_links>
     # </dmsf>
+    puts @response.body
     assert_select 'dmsf > dmsf_folders', :count => 1
-    assert_select 'dmsf > dmsf_folders > folder > id', :text => @folder6.id.to_s
-    assert_select 'dmsf > dmsf_folders > folder > title', :text => @folder6.title.to_s
+    assert_select 'dmsf > dmsf_folders > folder > id', :text => @folder7.id.to_s
+    assert_select 'dmsf > dmsf_folders > folder > title', :text => @folder7.title.to_s
     assert_select 'dmsf > dmsf_files', :count => 1
   end