Skip to content

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

fix ABC error

Behrokh Satarnejada41fe0114814
diff --git a/modules/meeting/app/menus/meetings/menu.rb b/modules/meeting/app/menus/meetings/menu.rb
index ed0eef0430e..bae9e271458 100644
--- a/modules/meeting/app/menus/meetings/menu.rb
+++ b/modules/meeting/app/menus/meetings/menu.rb
@@ -107,18 +107,10 @@ module Meetings
end
def involvement_sidebar_menu_items
- invitation_filter = [{ invited_user_id: { operator: "=", values: [User.current.id.to_s] } }].to_json
-
[
- menu_item(title: I18n.t(:label_invitations),
- query_params: { filters: invitation_filter, sort: "start_time" },
- selected: params[:filters].to_s.include?("invited_user_id")),
- menu_item(title: I18n.t(:label_attended),
- query_params: { filters: attendee_filter, upcoming: false },
- selected: params[:filters].to_s.include?("attended_user_id")),
- menu_item(title: I18n.t(:label_created_by_me),
- query_params: { filters: author_filter },
- selected: params[:filters].to_s.include?("author_id"))
+ invitations_menu_item,
+ attended_menu_item,
+ created_by_me_menu_item
]
end
@@ -162,5 +154,32 @@ module Meetings
current_recurring_meeting_id == href_meeting_id
end
+
+ private
+
+ def invitations_menu_item
+ invitation_filter = [{ invited_user_id: { operator: "=", values: [User.current.id.to_s] } }].to_json
+ menu_item(
+ title: I18n.t(:label_invitations),
+ query_params: { filters: invitation_filter, sort: "start_time" },
+ selected: params[:filters].to_s.include?("invited_user_id")
+ )
+ end
+
+ def attended_menu_item
+ menu_item(
+ title: I18n.t(:label_attended),
+ query_params: { filters: attendee_filter, upcoming: false },
+ selected: params[:filters].to_s.include?("attended_user_id")
+ )
+ end
+
+ def created_by_me_menu_item
+ menu_item(
+ title: I18n.t(:label_created_by_me),
+ query_params: { filters: author_filter },
+ selected: params[:filters].to_s.include?("author_id")
+ )
+ end
end
end