Replaces reform by a simple layer of Disposable +
ActiveModel::Validations for contracts.
Additionally removes the custom error handling where OpenProject added
symbols to keep the ability to identify faulty attributes while having
non standard format (deviates from `%{attribute} %{message}`).
Changes to active record now allow us to define the format of a message
on i18n level, e.g. `%{message}`. Therefore the patching can be removed.
Reform plans to remove support for ActiveModel::Validations in version
4.0 at the latest but even today, support for it is hapazard. As we do
not need the full stack of Reform anyway, we can solely rely on
Disposable.
pull/8590/head
ulferts
4 years ago
committed by
Oliver Günther
parent
5dcf92f61e
commit
e2961fba14
@ -1,79 +0,0 @@ |
||||
#-- encoding: UTF-8 |
||||
|
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2020 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-2017 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 docs/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
module OpenProject |
||||
module Patches |
||||
module Reform |
||||
def merge!(errors, prefix = []) |
||||
@store_new_symbols = false |
||||
super(errors, prefix) |
||||
@store_new_symbols = true |
||||
|
||||
errors.keys.each do |attribute| |
||||
errors.symbols_and_messages_for(attribute).each do |symbol, full_message, partial_message| |
||||
symbols_and_messages = writable_symbols_and_messages_for(attribute) |
||||
next if symbols_and_messages && symbols_and_messages.any? do |sam| |
||||
sam[0] === symbol && |
||||
sam[1] === full_message && |
||||
sam[2] === partial_message |
||||
end |
||||
|
||||
symbols_and_messages << [symbol, full_message, partial_message] |
||||
end |
||||
end |
||||
end |
||||
end |
||||
end |
||||
end |
||||
|
||||
require "reform/form/active_model/validations" |
||||
|
||||
Reform::Form.class_eval do |
||||
include Reform::Form::ActiveModel::Validations |
||||
end |
||||
|
||||
Reform::Contract.class_eval do |
||||
include Reform::Form::ActiveModel::Validations |
||||
end |
||||
|
||||
Reform::Form::ActiveModel::Validations::Validator.class_eval do |
||||
## |
||||
# use activerecord as the base scope instead of 'activemodel' to be compatible |
||||
# to the messages we have already stored |
||||
def self.i18n_scope |
||||
:activerecord |
||||
end |
||||
end |
||||
|
||||
require 'reform/contract' |
||||
|
||||
class Reform::Form::ActiveModel::Errors |
||||
prepend OpenProject::Patches::Reform |
||||
end |
||||
@ -0,0 +1,49 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2020 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-2017 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 docs/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
module Redmine |
||||
module Acts |
||||
module Customizable |
||||
module HumanAttributeName |
||||
# If a model acts_as_customizable it will inject attributes like 'custom_field_1' into itself. |
||||
# Using this method, they can now be i18ned same as every other attribute. This is for example |
||||
# for error messages following the format of '%{attribute} %{message}' where `attribute` is resolved |
||||
# by calling IncludingClass.human_attribute_name |
||||
def human_attribute_name(attribute, options = {}) |
||||
match = /\Acustom_field_(?<id>\d+)\z/.match(attribute) |
||||
|
||||
if match |
||||
CustomField.find_by(id: match[:id]).name |
||||
else |
||||
super |
||||
end |
||||
end |
||||
end |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue