mirror of
https://github.com/opf/openproject.git
synced 2026-06-14 03:30:14 +00:00
Remove MeetingContent, MeetingMinute, and MeetingAgenda
old tables no longer in use since 16.0
This commit is contained in:
Oliver Günther
@@ -56,7 +56,7 @@ module Admin
|
||||
helpers.link_to(text, project_wiki_path(project, container))
|
||||
when User
|
||||
helpers.link_to_user(container)
|
||||
when MeetingContent
|
||||
when Meeting
|
||||
helpers.link_to(text, meeting_path(container.meeting_id))
|
||||
when Grids::Overview
|
||||
helpers.link_to(text, project_overview_path(container.project_id))
|
||||
|
||||
@@ -63,7 +63,6 @@ module Users
|
||||
)
|
||||
SQL
|
||||
},
|
||||
{ class: Journal::MeetingContentJournal, column: :text },
|
||||
{ class: Message, column: :content },
|
||||
{ class: Journal::MessageJournal, column: :content },
|
||||
{ class: News, column: :description },
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
# 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.
|
||||
#++
|
||||
|
||||
class Journal::MeetingContentJournal < Journal::BaseJournal
|
||||
self.table_name = "meeting_content_journals"
|
||||
|
||||
belongs_to :meeting
|
||||
belongs_to :author, class_name: "User"
|
||||
|
||||
def editable?
|
||||
false
|
||||
end
|
||||
end
|
||||
@@ -44,12 +44,6 @@ class Meeting < ApplicationRecord
|
||||
|
||||
has_many :time_entries, dependent: :delete_all, inverse_of: :entity, as: :entity
|
||||
|
||||
# Legacy association to minutes, agendas, contents
|
||||
# to be removed in 17.0
|
||||
has_one :agenda, dependent: :destroy, class_name: "MeetingAgenda"
|
||||
has_one :minutes, dependent: :destroy, class_name: "MeetingMinutes"
|
||||
has_many :contents, -> { readonly }, class_name: "MeetingContent"
|
||||
|
||||
has_many :participants,
|
||||
dependent: :destroy,
|
||||
class_name: "MeetingParticipant"
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
# 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.
|
||||
#++
|
||||
|
||||
class MeetingAgenda < MeetingContent
|
||||
def lock!(user = User.current)
|
||||
self.journal_notes = I18n.t("events.meeting_agenda_closed")
|
||||
self.author = user
|
||||
self.locked = true
|
||||
save
|
||||
end
|
||||
|
||||
def unlock!(user = User.current)
|
||||
self.journal_notes = I18n.t("events.meeting_agenda_opened")
|
||||
self.author = user
|
||||
self.locked = false
|
||||
save
|
||||
end
|
||||
|
||||
def editable?
|
||||
!locked?
|
||||
end
|
||||
end
|
||||
@@ -1,81 +0,0 @@
|
||||
# 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.
|
||||
#++
|
||||
#
|
||||
|
||||
class MeetingContent < ApplicationRecord
|
||||
include OpenProject::Journal::AttachmentHelper
|
||||
|
||||
belongs_to :meeting
|
||||
# Show the project on activity and search views
|
||||
has_one :project, through: :meeting
|
||||
belongs_to :author, class_name: "User"
|
||||
|
||||
acts_as_attachable(
|
||||
after_remove: :attachments_changed,
|
||||
order: "#{Attachment.table_name}.file",
|
||||
add_on_new_permission: :create_meetings,
|
||||
add_on_persisted_permission: :edit_meetings,
|
||||
view_permission: :view_meetings,
|
||||
delete_permission: :edit_meetings,
|
||||
modification_blocked: ->(*) { false }
|
||||
)
|
||||
|
||||
acts_as_journalized
|
||||
acts_as_event type: Proc.new { |o| o.class.to_s.underscore.dasherize.to_s },
|
||||
title: Proc.new { |o| "#{o.class.model_name.human}: #{o.meeting.title}" },
|
||||
url: Proc.new { |o| { controller: "/meetings", action: "show", id: o.meeting } }
|
||||
|
||||
scope :visible, ->(*args) {
|
||||
includes(meeting: :project)
|
||||
.references(:projects)
|
||||
.merge(Project.allowed_to(args.first || User.current, :view_meetings))
|
||||
}
|
||||
|
||||
def editable?
|
||||
true
|
||||
end
|
||||
|
||||
def diff(version_to = nil, version_from = nil)
|
||||
version_to = version_to ? version_to.to_i : version
|
||||
version_from = version_from ? version_from.to_i : version_to - 1
|
||||
version_to, version_from = version_from, version_to unless version_from < version_to
|
||||
|
||||
content_to = journals.find_by_version(version_to)
|
||||
content_from = journals.find_by_version(version_from)
|
||||
|
||||
content_to && content_from ? Wikis::Diff.new(content_to, content_from) : nil
|
||||
end
|
||||
|
||||
def at_version(version)
|
||||
journals
|
||||
.joins("JOIN meeting_contents ON meeting_contents.id = journals.journable_id AND meeting_contents.type='#{self.class}'")
|
||||
.where(version:)
|
||||
.first.data
|
||||
end
|
||||
end
|
||||
@@ -1,34 +0,0 @@
|
||||
# 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.
|
||||
#++
|
||||
|
||||
class MeetingMinutes < MeetingContent
|
||||
def editable?
|
||||
meeting.agenda.present? && meeting.agenda.locked?
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,13 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class DeleteOldMeetingContents < ActiveRecord::Migration[8.0]
|
||||
def up
|
||||
execute("DROP TABLE meeting_contents")
|
||||
execute("DROP TABLE meeting_content_journals")
|
||||
end
|
||||
|
||||
def down
|
||||
raise ActiveRecord::IrreversibleMigration,
|
||||
"The old meeting contents cannot be restored."
|
||||
end
|
||||
end
|
||||
@@ -40,7 +40,7 @@ module API
|
||||
end
|
||||
|
||||
def get_attachment_self_path
|
||||
api_v3_paths.attachments_by_meeting_content @meeting.id
|
||||
api_v3_paths.attachments_by_meeting @meeting.id
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
# 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.
|
||||
#++
|
||||
|
||||
module API
|
||||
module V3
|
||||
module Attachments
|
||||
class AttachmentsByMeetingContentAPI < ::API::OpenProjectAPI
|
||||
resources :attachments do
|
||||
get do
|
||||
status :gone
|
||||
end
|
||||
|
||||
post do
|
||||
status :gone
|
||||
end
|
||||
|
||||
namespace :prepare do
|
||||
post do
|
||||
status :gone
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,44 +0,0 @@
|
||||
# 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.
|
||||
#++
|
||||
|
||||
module API
|
||||
module V3
|
||||
module Meetings
|
||||
class MeetingContentsAPI < ::API::OpenProjectAPI
|
||||
resources :meeting_contents do
|
||||
route_param :id do
|
||||
get do
|
||||
status :gone
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -176,8 +176,6 @@ module OpenProject::Meeting
|
||||
patch_with_namespace :BasicData, :SettingSeeder
|
||||
|
||||
replace_principal_references "Meeting" => %i[author_id],
|
||||
"MeetingAgenda" => %i[author_id],
|
||||
"MeetingMinutes" => %i[author_id],
|
||||
"MeetingAgendaItem" => %i[author_id presenter_id],
|
||||
"MeetingParticipant" => :user_id,
|
||||
"MeetingOutcome" => :author_id
|
||||
@@ -187,7 +185,6 @@ module OpenProject::Meeting
|
||||
|
||||
add_api_endpoint "API::V3::Root" do
|
||||
mount ::API::V3::Meetings::MeetingsAPI
|
||||
mount ::API::V3::Meetings::MeetingContentsAPI
|
||||
end
|
||||
|
||||
config.to_prepare do
|
||||
@@ -223,17 +220,5 @@ module OpenProject::Meeting
|
||||
add_api_path :attachments_by_meeting do |id|
|
||||
"#{meeting(id)}/attachments"
|
||||
end
|
||||
|
||||
add_api_path :attachments_by_meeting_content do |id|
|
||||
"#{meeting_content(id)}/attachments"
|
||||
end
|
||||
|
||||
add_api_path :attachments_by_meeting_agenda do |id|
|
||||
attachments_by_meeting_content id
|
||||
end
|
||||
|
||||
add_api_path :attachments_by_meeting_minutes do |id|
|
||||
attachments_by_meeting_content id
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user