OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
fix activity provider for time entries
Klaus Zanders1d64471fb2af
diff --git a/modules/costs/app/models/activities/time_entry_activity_provider.rb b/modules/costs/app/models/activities/time_entry_activity_provider.rbindex cd9c3107c00..b2ac29e59c7 100644--- a/modules/costs/app/models/activities/time_entry_activity_provider.rb+++ b/modules/costs/app/models/activities/time_entry_activity_provider.rb@@ -31,7 +31,7 @@ class Activities::TimeEntryActivityProvider < Activities::BaseActivityProviderpermission: :view_time_entriesdef extend_event_query(query)- query.join(work_packages_table).on(activity_journals_table[:work_package_id].eq(work_packages_table[:id]))+ query.join(work_packages_table).on(work_package_join_condition)query.join(types_table).on(work_packages_table[:type_id].eq(types_table[:id]))end@@ -40,7 +40,8 @@ class Activities::TimeEntryActivityProvider < Activities::BaseActivityProvideractivity_journal_projection_statement(:hours, "time_entry_hours"),activity_journal_projection_statement(:comments, "time_entry_comments"),activity_journal_projection_statement(:project_id, "project_id"),- activity_journal_projection_statement(:work_package_id, "work_package_id"),+ activity_journal_projection_statement(:entity_type, "entity_type"),+ activity_journal_projection_statement(:entity_id, "entity_id"),projection_statement(projects_table, :name, "project_name"),projection_statement(work_packages_table, :subject, "work_package_subject"),projection_statement(types_table, :name, "type_name")@@ -49,8 +50,14 @@ class Activities::TimeEntryActivityProvider < Activities::BaseActivityProviderprotected+ def work_package_join_condition+ activity_journals_table[:entity_type].eq("WorkPackage").and(+ activity_journals_table[:entity_id].eq(work_packages_table[:id])+ )+ end+def event_title(event)- time_entry_object_name = event["work_package_id"].blank? ? event["project_name"] : work_package_title(event)+ event["entity_id"].blank? ? event["project_name"] : work_package_title(event)enddef event_type(_event)@@ -58,7 +65,7 @@ class Activities::TimeEntryActivityProvider < Activities::BaseActivityProviderenddef work_package_title(event)- Activities::WorkPackageActivityProvider.work_package_title(event["work_package_id"],+ Activities::WorkPackageActivityProvider.work_package_title(event["entity_id"],event["work_package_subject"],event["type_name"])end@@ -68,7 +75,10 @@ class Activities::TimeEntryActivityProvider < Activities::BaseActivityProviderenddef event_path(event)- "/work_packages/#{event['work_package_id']}"+ case event["entity_type"]+ when "WorkPackage" then "/work_packages/#{event['entity_id']}"+ when "Meeting" then "/meetings/#{event['entity_id']}"+ endenddef event_url(event)@@ -84,8 +94,9 @@ class Activities::TimeEntryActivityProvider < Activities::BaseActivityProviderenddef event_location(event, only_path: true)- filter_params = if event["work_package_id"].present?- work_package_id_filter(event["work_package_id"])+ filter_params = if event["entity_type"] == "WorkPackage"+ work_package_id_filter(event["entity_id"])+ # TODO: Add meeeing here?elseproject_id_filter(event["project_id"])enddiff --git a/spec/models/activities/fetcher_integration_spec.rb b/spec/models/activities/fetcher_integration_spec.rbindex 9528efdeb4d..3c148ec4e24 100644--- a/spec/models/activities/fetcher_integration_spec.rb+++ b/spec/models/activities/fetcher_integration_spec.rb@@ -56,7 +56,7 @@ RSpec.describe Activities::Fetcher, "integration" dolet(:forum) { create(:forum, project:) }let(:message) { create(:message, forum:, author: event_user) }let(:news) { create(:news, project:, author: event_user) }- let(:time_entry) { create(:time_entry, project:, work_package:, user: event_user) }+ let(:time_entry) { create(:time_entry, project:, entity: work_package, user: event_user) }let(:repository) { create(:repository_subversion, project:) }let(:changeset) { create(:changeset, committer: event_user.login, repository:) }let(:wiki) { create(:wiki, project:) }