Merge pull request #166 from arBmind/feature/fix_time_bookings_visibility

Fix time bookings visibility

Author: arBmind

.github/data/Gemfile.local.5.1.2

@@ -0,0 +1,6 @@
+
+# workaround for Redmine < 5.1.3
+gem 'blankslate'
+
+# pin ruby gem to avoid rails <7 error
+gem 'concurrent-ruby', '<= 1.3.4'

.github/data/Gemfile.local.5.1.6

@@ -0,0 +1,3 @@
+
+# pin ruby gem to avoid rails <7 error
+gem 'concurrent-ruby', '<= 1.3.4'

.github/workflows/main.yml

@@ -9,16 +9,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        redmine: [ '5.1.2', '4.2.9' ]
-        ruby: [ '2.7.7' ]
+        redmine: [ '5.1.2', '5.1.6' ]
+        ruby: [ '2.7.7', '3.2.7' ]
         database: [ 'sqlite3', 'postgresql', 'mysql2' ]
-        include:
-          - redmine: '5.1.2'
-            ruby: '3.2.2'
-            database: 'postgresql'
-          - redmine: '5.1.2'
-            ruby: '3.2.2'
-            database: 'mysql2'
 
     services:
       postgresql:
@@ -47,12 +40,14 @@ jobs:
     - name: Install redmine
       run: wget https://github.com/redmine/redmine/archive/${{ matrix.redmine }}.tar.gz -qO- | tar -C $GITHUB_WORKSPACE -xz --strip=1 --show-transformed -f -
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: 'plugins/redmine_hourglass'
 
     - name: Create database config
-      run: cp $GITHUB_WORKSPACE/plugins/redmine_hourglass/.github/data/${{ matrix.database }}_database.yml $GITHUB_WORKSPACE/config/database.yml
+      run: |
+        cp $GITHUB_WORKSPACE/plugins/redmine_hourglass/.github/data/${{ matrix.database }}_database.yml $GITHUB_WORKSPACE/config/database.yml
+        cp $GITHUB_WORKSPACE/plugins/redmine_hourglass/.github/data/Gemfile.local.${{ matrix.redmine }} $GITHUB_WORKSPACE/Gemfile.local
 
     - name: Install dependencies
       run: |

app/models/hourglass/time_booking.rb

@@ -29,7 +29,11 @@ class TimeBooking < ApplicationRecord
     delegate :id, to: :user, prefix: true, allow_nil: true
     delegate :comments, :comments=, :hours, :project_id=, :save_custom_field_values, to: :time_entry, allow_nil: true
 
-    scope :visible, lambda { |*args| joins(:project).where(projects: {id: visible_condition(args.shift || User.current, *args)})
+    scope :visible, lambda { |*args|
+      user = args.shift || User.current
+      joins(:user).and(
+        TimeBooking.where(projects: { id: visible_own_project_ids(user, *args) }, users: { id: user.id }).
+        or(TimeBooking.where(projects: { id: visible_project_ids(user, *args) })))
     }
 
     def update(args = {})
@@ -61,10 +65,12 @@ def time_tracker_params
     end
 
     private
-    def self.visible_condition(user, _options = {})
-      project_ids = Project.allowed_to(user, :hourglass_view_booked_time).pluck :id
-      project_ids += Project.allowed_to(user, :hourglass_view_own_booked_time).pluck :id
-      project_ids.uniq
+    def self.visible_own_project_ids(user, _options = {})
+      Project.allowed_to(user, :hourglass_view_own_booked_time).pluck :id
+    end
+
+    def self.visible_project_ids(user, _options = {})
+      Project.allowed_to(user, :hourglass_view_booked_time).pluck :id
     end
 
     def fix_nil_hours