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
Add a feature flag for the iCal export
Klaus Zanders1a39edf78437
diff --git a/app/views/my/access_tokens/index.html.erb b/app/views/my/access_tokens/index.html.erbindex 479fb6c3f7f..38e7d6b719e 100644--- a/app/views/my/access_tokens/index.html.erb+++ b/app/views/my/access_tokens/index.html.erb@@ -41,7 +41,9 @@ See COPYRIGHT and LICENSE files for more details.<%= render ::My::AccessToken::APITokensSectionComponent.new(tokens: @user.api_tokens, token_type: Token::API) %><%= render partial: "icalendar_tokens_section", locals: { ical_tokens_grouped_by_query: @ical_tokens_grouped_by_query } %>-<%= render ::My::AccessToken::APITokensSectionComponent.new(tokens: @user.ical_meeting_tokens, token_type: Token::ICalMeeting) %>+<% if OpenProject::FeatureDecisions.meeting_ical_subscription_active? %>+ <%= render ::My::AccessToken::APITokensSectionComponent.new(tokens: @user.ical_meeting_tokens, token_type: Token::ICalMeeting) %>+<% end %><%= render partial: "oauth_tokens_section", locals: { granted_applications: granted_applications } %><%= render partial: "rss_tokens_section", locals: { rss_token: @user.rss_token } %><%= render partial: "storage_tokens_section", locals: { storage_tokens: @storage_tokens } %>diff --git a/modules/meeting/app/components/meetings/index_page_header_component.html.erb b/modules/meeting/app/components/meetings/index_page_header_component.html.erbindex 6e05000b7c4..c991c1d01da 100644--- a/modules/meeting/app/components/meetings/index_page_header_component.html.erb+++ b/modules/meeting/app/components/meetings/index_page_header_component.html.erb@@ -5,7 +5,7 @@header.with_title { page_title }header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: section_present? ? :normal : :bold)- if Setting.ical_enabled?+ if Setting.ical_enabled? && OpenProject::FeatureDecisions.meeting_ical_subscription_active?header.with_action_menu(menu_arguments: { anchor_align: :end },button_arguments: { icon: "kebab-horizontal", "aria-label": t(:label_more), data: { "test-selector": "meeting-more" } }diff --git a/modules/meeting/lib/open_project/meeting/engine.rb b/modules/meeting/lib/open_project/meeting/engine.rbindex bebcc46e80c..0c9c54f6b5e 100644--- a/modules/meeting/lib/open_project/meeting/engine.rb+++ b/modules/meeting/lib/open_project/meeting/engine.rb@@ -157,6 +157,11 @@ module OpenProject::Meetingendend+ initializer "openproject-meetings.feature_decisions" do+ OpenProject::FeatureDecisions.add :meeting_ical_subscription,+ description: "Allows users to subscribe to all of their meetings via iCalendar"+ end+activity_provider :meetings, class_name: "Activities::MeetingActivityProvider", default: falsepatches [:Project]