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
Restore manage_dashboards permission
Alexander Brandon Coles30d77c2b67fd
diff --git a/app/seeders/demo_data/overview_seeder.rb b/app/seeders/demo_data/overview_seeder.rbindex 44dca6260f1..f23b6c69170 100644--- a/app/seeders/demo_data/overview_seeder.rb+++ b/app/seeders/demo_data/overview_seeder.rb@@ -114,7 +114,7 @@ module DemoData.includes(:role_permissions).where(role_permissions: { permission: "edit_project" }).each do |role|- role.add_permission!(:manage_overview)+ role.add_permission!(:manage_dashboards)endendenddiff --git a/modules/calendar/spec/features/calendar_widget_spec.rb b/modules/calendar/spec/features/calendar_widget_spec.rbindex 9fd624ab5e4..30d55346011 100644--- a/modules/calendar/spec/features/calendar_widget_spec.rb+++ b/modules/calendar/spec/features/calendar_widget_spec.rb@@ -53,7 +53,7 @@ RSpec.describe "Calendar Widget", :js, with_settings: { start_of_week: 1 } doshared_let(:current_user) docreate(:user,member_with_permissions: {- project => %w[view_work_packages view_meetings edit_work_packages view_calendar manage_overview]+ project => %w[view_work_packages view_meetings edit_work_packages view_calendar manage_dashboards]})end@@ -82,7 +82,7 @@ RSpec.describe "Calendar Widget", :js, with_settings: { start_of_week: 1 } docreate(:user,preferences: { time_zone: "Asia/Tokyo" },member_with_permissions: {- project => %w[view_work_packages view_meetings edit_work_packages view_calendar manage_overview]+ project => %w[view_work_packages view_meetings edit_work_packages view_calendar manage_dashboards]})enddiff --git a/modules/overviews/app/components/overviews/dashboard_component.rb b/modules/overviews/app/components/overviews/dashboard_component.rbindex eb54b622297..3b06f515f88 100644--- a/modules/overviews/app/components/overviews/dashboard_component.rb+++ b/modules/overviews/app/components/overviews/dashboard_component.rb@@ -48,7 +48,7 @@ module Overviewsprivatedef allowed_to_manage?- current_user.allowed_in_project?(:manage_overview, project)+ current_user.allowed_in_project?(:manage_dashboards, project)endendenddiff --git a/modules/overviews/app/components/overviews/show_component.rb b/modules/overviews/app/components/overviews/show_component.rbindex a80b895b0fb..a42d8fcf879 100644--- a/modules/overviews/app/components/overviews/show_component.rb+++ b/modules/overviews/app/components/overviews/show_component.rb@@ -47,10 +47,6 @@ module Overviewsprivate- def allowed_to_manage?- current_user.allowed_in_project?(:manage_overview, project)- end-def sidebar_enabled?life_cycle_sidebar_enabled? || custom_fields_sidebar_enabled?enddiff --git a/modules/overviews/app/models/grids/overview.rb b/modules/overviews/app/models/grids/overview.rbindex 880273a4866..baad7874c15 100644--- a/modules/overviews/app/models/grids/overview.rb+++ b/modules/overviews/app/models/grids/overview.rb@@ -31,8 +31,8 @@ module Gridsbelongs_to :projectset_acts_as_attachable_options view_permission: :view_project,- delete_permission: :manage_overview,- add_permission: :manage_overview,+ delete_permission: :manage_dashboards,+ add_permission: :manage_dashboards,skip_permission_checks: falsedef to_sdiff --git a/modules/overviews/lib/overviews/engine.rb b/modules/overviews/lib/overviews/engine.rbindex 76e22ac23c2..4b930b01f0a 100644--- a/modules/overviews/lib/overviews/engine.rb+++ b/modules/overviews/lib/overviews/engine.rb@@ -94,10 +94,11 @@ module OverviewsOpenProject::AccessControl.map do |ac_map|ac_map.project_module nil do |map|map.permission :manage_overview,- { "overviews/overviews":- [- "show"- ] },+ { "overviews/overviews": %i[show] },+ permissible_on: :project,+ require: :member+ map.permission :manage_dashboards,+ { "overviews/overviews": %i[dashboard] },permissible_on: :project,require: :memberenddiff --git a/modules/overviews/lib/overviews/grid_registration.rb b/modules/overviews/lib/overviews/grid_registration.rbindex cf811904030..9d18f228aaf 100644--- a/modules/overviews/lib/overviews/grid_registration.rb+++ b/modules/overviews/lib/overviews/grid_registration.rb@@ -4,7 +4,7 @@ module Overviewsto_scope :project_overview_pathview_permission :view_project- edit_permission :manage_overview+ edit_permission :manage_dashboardsin_project_scope_path nildefaults -> {@@ -63,7 +63,7 @@ module Overviews}validations :create, ->(*_args) {- next if user.allowed_in_project?(:manage_overview, model.project)+ next if user.allowed_in_project?(:manage_dashboards, model.project)defaults = Overviews::GridRegistration.defaultsdiff --git a/modules/overviews/spec/components/overviews/dashboard_component_spec.rb b/modules/overviews/spec/components/overviews/dashboard_component_spec.rbindex 8316add8884..d66661d4493 100644--- a/modules/overviews/spec/components/overviews/dashboard_component_spec.rb+++ b/modules/overviews/spec/components/overviews/dashboard_component_spec.rb@@ -59,7 +59,7 @@ RSpec.describe Overviews::DashboardComponent, type: :component docontext "when user is allowed to manage" dobefore domock_permissions_for(user) do |mock|- mock.allow_in_project(:manage_overview, project:)+ mock.allow_in_project(:manage_dashboards, project:)endenddiff --git a/modules/overviews/spec/contracts/grids/create_contract_spec.rb b/modules/overviews/spec/contracts/grids/create_contract_spec.rbindex 7e7c95b93db..c4c48c00190 100644--- a/modules/overviews/spec/contracts/grids/create_contract_spec.rb+++ b/modules/overviews/spec/contracts/grids/create_contract_spec.rb@@ -42,7 +42,7 @@ RSpec.describe Grids::CreateContract, "for Grids::Overview" doGrids::Factory.build(scope, current_user)endlet(:instance) { described_class.new(grid, current_user) }- let(:permissions) { %i[manage_overview] }+ let(:permissions) { %i[manage_dashboards] }let(:current_user) { build_stubbed(:user) }before do@@ -83,7 +83,7 @@ RSpec.describe Grids::CreateContract, "for Grids::Overview" doendend- context "if the user lacks :manage_overview permission" do+ context "if the user lacks :manage_dashboards permission" do# View project is a public permission so every member will have it but as we stub...let(:permissions) { [:view_project] }diff --git a/modules/overviews/spec/contracts/roles/base_contract_spec.rb b/modules/overviews/spec/contracts/roles/base_contract_spec.rbindex 0dab90604f2..2433f845434 100644--- a/modules/overviews/spec/contracts/roles/base_contract_spec.rb+++ b/modules/overviews/spec/contracts/roles/base_contract_spec.rb@@ -38,36 +38,36 @@ RSpec.describe Roles::BaseContract docontext "for a work package role" dolet(:role) { work_package_role }- it "does not include manage_overview" do+ it "does not include manage_dashboards" doexpect(contract.assignable_permissions.map(&:name))- .not_to include :manage_overview+ .not_to include :manage_dashboardsendendcontext "for a member role" dolet(:role) { member_role }- it "includes manage_overview" do+ it "includes manage_dashboards" doexpect(contract.assignable_permissions.map(&:name))- .to include :manage_overview+ .to include :manage_dashboardsendendcontext "for a global role" dolet(:role) { global_role }- it "does not include manage_overview" do+ it "does not include manage_dashboards" doexpect(contract.assignable_permissions.map(&:name))- .not_to include :manage_overview+ .not_to include :manage_dashboardsendendcontext "for a builtin role" dolet(:role) { anonymous_role }- it "does not include manage_overview" do+ it "does not include manage_dashboards" doexpect(contract.assignable_permissions.map(&:name))- .not_to include :manage_overview+ .not_to include :manage_dashboardsendendenddiff --git a/modules/overviews/spec/features/low_permissions_page_creation_spec.rb b/modules/overviews/spec/features/low_permissions_page_creation_spec.rbindex c8c313ca6f7..51b98cd3445 100644--- a/modules/overviews/spec/features/low_permissions_page_creation_spec.rb+++ b/modules/overviews/spec/features/low_permissions_page_creation_spec.rb@@ -30,7 +30,7 @@ require "spec_helper"require_relative "../support/pages/dashboard"-RSpec.describe "Dashboard page on the fly creation if user lacks :manage_overview permission", :js do+RSpec.describe "Dashboard page on the fly creation if user lacks :manage_dashboards permission", :js dolet!(:type) { create(:type) }let!(:project) { create(:project, types: [type]) }let!(:open_status) { create(:default_status) }diff --git a/modules/overviews/spec/features/managing_dashboard_page_spec.rb b/modules/overviews/spec/features/managing_dashboard_page_spec.rbindex 13de2749373..5109a3cb089 100644--- a/modules/overviews/spec/features/managing_dashboard_page_spec.rb+++ b/modules/overviews/spec/features/managing_dashboard_page_spec.rb@@ -48,7 +48,7 @@ RSpec.describe "Dashboard page managing", :js doendlet(:permissions) do- %i[manage_overview+ %i[manage_dashboardsview_membersview_work_packagesadd_work_packagesdiff --git a/modules/overviews/spec/lib/overview/grid_registration_spec.rb b/modules/overviews/spec/lib/overview/grid_registration_spec.rbindex cc0e4c11291..539ff560ceb 100644--- a/modules/overviews/spec/lib/overview/grid_registration_spec.rb+++ b/modules/overviews/spec/lib/overview/grid_registration_spec.rb@@ -6,7 +6,7 @@ RSpec.describe Overviews::GridRegistration dolet(:grid) { build_stubbed(:overview, project:) }describe "writable?" do- let(:permissions) { %i[manage_overview view_project] }+ let(:permissions) { %i[manage_dashboards view_project] }before domock_permissions_for(user) do |mock|@@ -14,14 +14,14 @@ RSpec.describe Overviews::GridRegistration doendend- context "if the user has the :manage_overview permission" do+ context "if the user has the :manage_dashboards permission" doit "is truthy" doexpect(described_class).to be_writable(grid, user)endend- context "if the user lacks the :manage_overview permission and it is a persisted page" do+ context "if the user lacks the :manage_dashboards permission and it is a persisted page" dolet(:permissions) { %i[view_project] }it "is falsey" do@@ -30,7 +30,7 @@ RSpec.describe Overviews::GridRegistration doendend- context "if the user lacks the :manage_overview permission and it is a new record" do+ context "if the user lacks the :manage_dashboards permission and it is a new record" dolet(:permissions) { %i[view_project] }let(:grid) { Grids::Overview.new **attributes_for(:overview).merge(project:) }diff --git a/modules/overviews/spec/permissions/overviews_spec.rb b/modules/overviews/spec/permissions/overviews_spec.rbnew file mode 100644index 00000000000..9cb87fb378d--- /dev/null+++ b/modules/overviews/spec/permissions/overviews_spec.rb@@ -0,0 +1,38 @@+# 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"+require "support/permission_specs"++RSpec.describe Overviews::OverviewsController, "permissions", type: :controller do # rubocop:disable RSpec/EmptyExampleGroup,RSpec/SpecFilePathFormat+ include PermissionSpecs++ check_permission_required_for("overviews/overviews#show", :view_project)+enddiff --git a/modules/overviews/spec/requests/api/v3/grids/grids_resource_spec.rb b/modules/overviews/spec/requests/api/v3/grids/grids_resource_spec.rbindex 778e872c3c2..1eb3242c1cb 100644--- a/modules/overviews/spec/requests/api/v3/grids/grids_resource_spec.rb+++ b/modules/overviews/spec/requests/api/v3/grids/grids_resource_spec.rb@@ -129,7 +129,7 @@ RSpec.describe "API v3 Grids resource", content_type: :json dodescribe "#post api/v3/grids" dolet(:path) { api_v3_paths.grids }- let(:permissions) { %i[manage_overview] }+ let(:permissions) { %i[manage_dashboards] }let(:params) do{@@ -149,7 +149,7 @@ RSpec.describe "API v3 Grids resource", content_type: :json doit_behaves_like "creates a grid resource"- context "if lacking the manage_overview permission and not changing the default values" do+ context "if lacking the manage_dashboards permission and not changing the default values" do# Creating a grid should be possible for every member in the project to avoid having an empty page for the project# which is why this test case is the same as the one above.# But this is only true if only the scope is provided and no other attribute.@@ -167,7 +167,7 @@ RSpec.describe "API v3 Grids resource", content_type: :json doit_behaves_like "creates a grid resource"end- context "if lacking the manage_overview permission and changing the default values" do+ context "if lacking the manage_dashboards permission and changing the default values" do# Creating a grid should be possible for every member in the project to avoid having an empty page for the project# which is why this test case is the same as the one above.# But this is only true if only the scope is provided and no other attribute.