Merge pull request #21340 from opf/merge-release/17.0-20251204132109

as-op · web-flow · commit 151cb3dc0545 · 2025-12-04T15:52:11.000+01:00
Merge release/17.0 into dev
diff --git a/app/components/wiki_pages/show_page_header_component.html.erb b/app/components/wiki_pages/show_page_header_component.html.erb
@@ -162,15 +162,25 @@ See COPYRIGHT and LICENSE files for more details.
           item.with_leading_visual_icon(icon: "op-printer")
         end
         if User.current.allowed_in_project?(:export_wiki_pages, @project)
-          menu.with_item(
+          menu.with_sub_menu_item(
             tag: :a,
             label: t("js.label_export"),
-            size: :medium,
-            href: "",
             title: t("js.label_export"),
-            classes: "modal-delivery-element--activation-link"
+            size: :auto,
+            test_selector: "export-button"
           ) do |item|
             item.with_leading_visual_icon(icon: :download)
+            if show_atom_link?
+              item.with_item(label: t("export.format.atom"), tag: :a, href: export_atom_link) do |subitem|
+                subitem.with_leading_visual_icon(icon: :"op-file-atom")
+              end
+            end
+            item.with_item(
+              label: t("text_formatting.markdown"), tag: :a, href: export_markdown_link,
+              test_selector: "markdown-export"
+            ) do |subitem|
+              subitem.with_leading_visual_icon(icon: :file)
+            end
           end
         end
         menu.with_item(
@@ -185,12 +195,3 @@ See COPYRIGHT and LICENSE files for more details.
     end
   end
 %>
-
-<section data-augmented-model-wrapper
-         data-modal-class-name="wiki-export---modal">
-  <%= link_to t("js.label_export"),
-              "",
-              title: t("js.label_export"),
-              style: "display: none;" %>
-  <%= render partial: "wiki/wiki_export_modal" %>
-</section>
diff --git a/app/components/wiki_pages/show_page_header_component.rb b/app/components/wiki_pages/show_page_header_component.rb
@@ -55,5 +55,29 @@ def show_edit?
     def show_rollback?
       User.current.allowed_in_project?(:edit_wiki_pages, @project) && !@page.current_version?
     end
+
+    def show_atom_link?
+      @project.present? && @project.module_enabled?("activity")
+    end
+
+    def export_atom_link
+      url_for(
+        controller: "/activities",
+        action: "index",
+        id: @project,
+        show_wiki_edits: 1,
+        apply: true,
+        key: User.current.rss_key,
+        format: "atom"
+      )
+    end
+
+    def export_markdown_link
+      url_for(
+        version: @page.version,
+        id: @page,
+        format: "markdown"
+      )
+    end
   end
 end
diff --git a/app/forms/admin/settings/general_settings/welcome_block_form.rb b/app/forms/admin/settings/general_settings/welcome_block_form.rb
@@ -33,7 +33,7 @@ module Settings
     module GeneralSettings
       class WelcomeBlockForm < ApplicationForm
         settings_form do |sf|
-          sf.text_field(name: :welcome_title)
+          sf.text_field(name: :welcome_title, input_width: :medium)
 
           sf.rich_text_area(
             name: :welcome_text,
diff --git a/app/forms/admin/settings/general_settings_form.rb b/app/forms/admin/settings/general_settings_form.rb
@@ -37,7 +37,8 @@ class GeneralSettingsForm < ApplicationForm
 
       settings_form do |sf|
         sf.text_field(
-          name: :app_title
+          name: :app_title,
+          input_width: :medium
         )
 
         sf.text_field(
diff --git a/app/forms/custom_fields/inputs/date.rb b/app/forms/custom_fields/inputs/date.rb
@@ -34,6 +34,6 @@ class CustomFields::Inputs::Date < CustomFields::Inputs::Base::Input
   end
 
   def input_attributes
-    super.merge({ type: "date" })
+    super.merge({ input_width: :xsmall, type: "date" })
   end
 end
diff --git a/app/models/work_packages/scopes/allowed_to.rb b/app/models/work_packages/scopes/allowed_to.rb
@@ -88,54 +88,34 @@ def logged_in_non_admin_allowed_to(user, permissions)
           WHERE entity_id IS NULL
         SQL
 
-        # Remove those entries from before that are
-        # * entity (WorkPackage) specific AND
-        # * have the same project as a non-entity specific entry.
-        # That is the case if a work package is shared with a user
-        # while the user is already a member in the project.
-        # Since the allowed_to filtering is already specific to the permissions, that removal is safe.
-        entity_member_projects_without_duplicates = Arel.sql(<<~SQL.squish)
-          SELECT * FROM entity_member_projects
-          WHERE NOT EXISTS (
-            SELECT 1 FROM project_member_projects
-            WHERE project_member_projects.id = entity_member_projects.id
-          )
-        SQL
-
         # Take all work packages allowed by either project-wide or entity-specific membership.
-        # But now remove all those that are in a project for which an entity-specific membership exists that is not
-        # for that entity (work package).
-        # An alternative way of formulating this would be by comparing
-        # * That the project_id matches AND
-        # * the entity_id matches OR the entity_id is null
-        #  ```
-        #   SELECT * from work_packages
-        # 	WHERE EXISTS (
-        # 	  SELECT 1 FROM allowed_projects projects
-        #     WHERE projects.id = work_packages.project_id
-        #     AND (projects.entity_id = work_packages.id OR projects.entity_id IS NULL)
-        # 	)
-        # ```
-        # Postgresql however sometimes turns to a sequential scan with the query above.
+        # PostgreSQL however sometimes turns to a sequential scan with the query above.
         #
-        # Index scans can still happen in the combination of the CTE with the check outside of the
-        # CTEs for the existence of any record.
-        # This is particularly likely in case AR.exists? is used which adds a LIMIT 1
+        # It is currently unclear if index scans can still happen in the combination of the CTE with the check
+        # outside of the CTEs for the existence of any record.
+        # This happened in the past, before changing this CTE to a UNION, in case AR.exists? is used which adds a LIMIT 1
         # to the query. In this case, there is a known shortcoming that PostgreSQL's query planner
         # will make poor choices
         # (https://www.postgresql.org/message-id/flat/CA%2BU5nMLbXfUT9cWDHJ3tpxjC3bTWqizBKqTwDgzebCB5bAGCgg%40mail.gmail.com).
         #
         # Once AR supports adding materialization hints (https://github.com/rails/rails/pull/54322), the inner
         # `allowed` CTE can be abandoned as it is only used for being able to provide such a hint.
+        # Having the inner materialized CTE has no known negative side effects which is why it is kept.
         allowed_by_projects_and_work_packages = Arel.sql(<<~SQL.squish)
           WITH allowed AS MATERIALIZED (
-            SELECT id from work_packages
-            WHERE project_id in (SELECT id FROM member_projects)
-            AND NOT EXISTS (
-              SELECT 1 FROM entity_member_projects_without_duplicates
-              WHERE entity_member_projects_without_duplicates.id = work_packages.project_id
-              AND entity_member_projects_without_duplicates.entity_id != work_packages.id
-            )
+            SELECT
+              work_packages.id
+            FROM
+              work_packages
+            JOIN project_member_projects ON project_member_projects.id	= work_packages.project_id
+
+            UNION
+
+            SELECT
+              work_packages.id
+            FROM
+              work_packages
+            JOIN entity_member_projects ON entity_member_projects.entity_id = work_packages.id
           )
 
           SELECT * from allowed
@@ -144,7 +124,6 @@ def logged_in_non_admin_allowed_to(user, permissions)
         with(member_projects: Arel.sql(allowed_via_project_or_work_package_membership.to_sql),
              entity_member_projects:,
              project_member_projects:,
-             entity_member_projects_without_duplicates:,
              allowed_by_projects_and_work_packages:)
           .where(<<~SQL.squish)
             EXISTS (
diff --git a/app/views/wiki/_wiki_export_modal.html.erb b/app/views/wiki/_wiki_export_modal.html.erb
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -2611,7 +2611,7 @@ en:
         title: "Write internal comments only a small group can see"
         description: " "
       portfolio_management:
-        description: Organize your work effectively by creating portfolios and programs with the portfolio management module.
+        description: Align your projects to your strategic goals by organizing them into portfolios and programs.
     teaser:
       title:
         one: "One day left of %{trial_plan} trial token"
diff --git a/docs/release-notes/17-0-0/README.md b/docs/release-notes/17-0-0/README.md
@@ -22,6 +22,13 @@ In these Release Notes, we will give an overview of important feature changes. A
 
 <!-- Remove this section if empty, add to it in pull requests linking to tickets and provide information -->
 
+### Removal of special semver
+
+We removed the `special` fragment of the semantic version of OpenProject. This has not been in use.
+Unless you are relying on this value in one of your plugins, you can ignore this change.
+
+Reference: \[[#67036](https://community.openproject.org/wp/67036)\]
+
 <!--more-->
 
 ## Bug fixes and changes
diff --git a/frontend/src/global_styles/common/export-options/export-options.sass b/frontend/src/global_styles/common/export-options/export-options.sass
@@ -24,14 +24,3 @@
     &-label
       display: block
       padding: 10px 0 0 0
-
-  &.op-export-options-grid
-    display: grid
-    grid-template-columns: 1fr 1fr 1fr
-
-    @media screen and (max-width: 480px)
-      grid-template-columns: 1fr 1fr
-
-    @media screen and (max-width: 320px)
-      grid-template-columns: 1fr
-
diff --git a/lookbook/previews/open_project/deprecated/modal_preview.rb b/lookbook/previews/open_project/deprecated/modal_preview.rb
@@ -34,8 +34,6 @@ module Deprecated
     # @display min_height 500px
     class ModalPreview < Lookbook::Preview
       def default; end
-
-      def danger_zone; end
     end
   end
 end
diff --git a/modules/costs/spec/lib/api/v3/cost_entries/cost_entry_representer_spec.rb b/modules/costs/spec/lib/api/v3/cost_entries/cost_entry_representer_spec.rb
@@ -65,7 +65,7 @@
     it_behaves_like "has a titled link" do
       let(:link) { "entity" }
       let(:href) { api_v3_paths.work_package cost_entry.entity.id }
-      let(:title) { cost_entry.work_package.subject }
+      let(:title) { cost_entry.entity.subject }
     end
   end
 
diff --git a/spec/features/wiki/export_spec.rb b/spec/features/wiki/export_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe "project export", :js do
+  shared_let(:project) { create(:project) }
+
+  let(:wiki_page1) do
+    build(:wiki_page, title: "Some title!")
+  end
+
+  let(:current_user) { create(:admin) }
+
+  before do
+    @download_list = DownloadList.new
+
+    login_as(current_user)
+
+    project.wiki.pages << wiki_page1
+
+    project.wiki.save!
+
+    visit project_wiki_path(project, "Some title!")
+  end
+
+  after do
+    DownloadList.clear
+  end
+
+  subject { @download_list.refresh_from(page).latest_downloaded_content } # rubocop:disable RSpec/InstanceVariable
+
+  it "exports the wiki" do
+    page.find_test_selector("wiki-more-dropdown-menu").click
+    page.find_test_selector("export-button").click
+
+    page.find_test_selector("markdown-export").click
+
+    wait_for_network_idle
+
+    begin
+      perform_enqueued_jobs
+    rescue StandardError
+      # nothing
+    end
+
+    result = expect(subject)
+    result.to have_text(wiki_page1.title)
+  end
+end
diff --git a/spec/models/work_packages/scopes/allowed_to_spec.rb b/spec/models/work_packages/scopes/allowed_to_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ class GeneralSettingsForm < ApplicationForm`
`37`	`37`
`38`	`38`	`settings_form do \|sf\|`
`39`	`39`	`sf.text_field(`
`40`		`- name: :app_title`
	`40`	`+ name: :app_title,`
	`41`	`+ input_width: :medium`
`41`	`42`	`)`
`42`	`43`
`43`	`44`	`sf.text_field(`