diff --git a/lib/open_project/documents/engine.rb b/lib/open_project/documents/engine.rb index b01dc41c12..db74c6c5af 100644 --- a/lib/open_project/documents/engine.rb +++ b/lib/open_project/documents/engine.rb @@ -79,7 +79,8 @@ module OpenProject::Documents # Have to apply this one by hand and not via op_engine patches method # becauses the op_engine method does not allow for patching something # in the lib/open_project directory. Bummer. - require 'open_project/documents/patches/text_formatting_patch' + require_dependency 'open_project/documents/patches/text_formatting_patch' + require_dependency 'open_project/documents/patches/textile_converter_patch' end end end diff --git a/lib/open_project/documents/patches/text_formatting_patch.rb b/lib/open_project/documents/patches/text_formatting_patch.rb index 7c2640cf71..5a83c4107e 100644 --- a/lib/open_project/documents/patches/text_formatting_patch.rb +++ b/lib/open_project/documents/patches/text_formatting_patch.rb @@ -78,6 +78,6 @@ module OpenProject::Documents::Patches end end -unless OpenProject::TextFormatting.included_modules.include?(OpenProject::Documents::Patches::TextFormattingPatch) - OpenProject::TextFormatting.send(:include, OpenProject::Documents::Patches::TextFormattingPatch) -end +# unless OpenProject::TextFormatting.included_modules.include?(OpenProject::Documents::Patches::TextFormattingPatch) +# OpenProject::TextFormatting.send(:include, OpenProject::Documents::Patches::TextFormattingPatch) +# end diff --git a/lib/open_project/documents/patches/textile_converter_patch.rb b/lib/open_project/documents/patches/textile_converter_patch.rb new file mode 100644 index 0000000000..72d7253e6c --- /dev/null +++ b/lib/open_project/documents/patches/textile_converter_patch.rb @@ -0,0 +1,42 @@ +#-- copyright +# OpenProject Documents Plugin +# +# Former OpenProject Core functionality extracted into a plugin. +# +# Copyright (C) 2009-2014 the OpenProject Foundation (OPF) +# +# 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 doc/COPYRIGHT.rdoc for more details. +#+ + +module OpenProject::Documents::Patches + module TextileConverterPatch + def models_to_convert + super + { ::Document => [:description] } + end + end +end + +::OpenProject::TextFormatting::Formatters::Markdown::TextileConverter.prepend( + ::OpenProject::Documents::Patches::TextileConverterPatch +) \ No newline at end of file