From db8f09d79a8ed537ab1ba2cf3473e75dedc6d39f Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Sun, 24 Jul 2022 15:01:56 +0200 Subject: [PATCH] Fix import for latest redmine changes --- app/models/additionals_import.rb | 10 ++-------- app/views/wiki/_user_macros.html.slim | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/models/additionals_import.rb b/app/models/additionals_import.rb index ebaf3c73..061105f2 100644 --- a/app/models/additionals_import.rb +++ b/app/models/additionals_import.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class AdditionalsImport < Import + attr_accessor :project + class_attribute :import_class # Returns the objects that were imported @@ -9,14 +11,6 @@ class AdditionalsImport < Import import_class.where(id: object_ids).order(:id) end - def project=(project) - settings['project'] = project - end - - def project - settings['project'] - end - def mappable_custom_fields object = import_class.new @custom_fields = object.custom_field_values.map(&:custom_field) diff --git a/app/views/wiki/_user_macros.html.slim b/app/views/wiki/_user_macros.html.slim index 0de6433d..2c8a621f 100644 --- a/app/views/wiki/_user_macros.html.slim +++ b/app/views/wiki/_user_macros.html.slim @@ -22,4 +22,4 @@ .user.line = l :field_mail ' : - = mail_to user.mail, nil, encode: 'javascript' + = mail_to user.mail