The `Projects::UpdateService` used by the API endpoint was duplicating the checks done in `ArchiveContract` and `UnarchiveContract`. Now the relevant contract is called and used instead. As the duplication has been removed, the class `Projects::Archiver` is not needed anymore and its methods have been inlined. Also, as project is not active when being archived, all permission checks would fail because no action is allowed on archived projects. So the condition was relaxed a little to also allow permission check on projects being archived.pull/11853/head
parent
5cf125a6f9
commit
164daa48f8
@ -1,50 +0,0 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2023 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. |
||||
#++ |
||||
|
||||
module Projects |
||||
module Archiver |
||||
# Check that there is no wp of a non descendant project that is assigned |
||||
# to one of the project or descendant versions |
||||
def validate_no_foreign_wp_references |
||||
version_ids = model.rolled_up_versions.select(:id) |
||||
|
||||
exists = WorkPackage |
||||
.where.not(project_id: model.self_and_descendants.select(:id)) |
||||
.where(version_id: version_ids) |
||||
.exists? |
||||
|
||||
errors.add :base, :foreign_wps_reference_version if exists |
||||
end |
||||
|
||||
def validate_all_ancestors_active |
||||
if model.ancestors.any?(&:archived?) |
||||
errors.add :base, :archived_ancestor |
||||
end |
||||
end |
||||
end |
||||
end |
Loading…
Reference in new issue