diff --git a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts index 4beb9c4922f..b0da09260f0 100644 --- a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts +++ b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts @@ -429,7 +429,7 @@ export class TimeEntryCalendarComponent implements AfterViewInit, OnDestroy { private editEvent(entry:TimeEntryResource):void { void this.turboRequests.request( - `${this.pathHelper.timeEntryEditDialog(entry.id as string)}`, + `${this.pathHelper.timeEntryEditDialog(entry.id as string)}?onlyMe=true`, { method: 'GET' }, ); } @@ -465,7 +465,7 @@ export class TimeEntryCalendarComponent implements AfterViewInit, OnDestroy { } void this.turboRequests.request( - `${this.pathHelper.timeEntryDialog()}?date=${date.format('YYYY-MM-DD')}`, + `${this.pathHelper.timeEntryDialog()}?date=${date.format('YYYY-MM-DD')}&onlyMe=true`, { method: 'GET' }, ); } diff --git a/modules/costs/app/controllers/time_entries_controller.rb b/modules/costs/app/controllers/time_entries_controller.rb index 81a503b461b..7598efb0570 100644 --- a/modules/costs/app/controllers/time_entries_controller.rb +++ b/modules/costs/app/controllers/time_entries_controller.rb @@ -46,11 +46,7 @@ class TimeEntriesController < ApplicationController def dialog @show_work_package = params[:work_package_id].blank? - @show_user = if @project - User.current.allowed_in_project?(:log_time, @project) - else - User.current.allowed_in_any_project?(:log_time) - end + @show_user = show_user_input_in_dialog @time_entry.spent_on ||= params[:date].presence || Time.zone.today end @@ -132,6 +128,16 @@ class TimeEntriesController < ApplicationController private + def show_user_input_in_dialog + return false if params[:onlyMe] == "true" + + if @project + User.current.allowed_in_project?(:log_time, @project) + else + User.current.allowed_in_any_project?(:log_time) + end + end + def form_config_options { show_user: params[:time_entry][:show_user] == "true",