include former patch

pull/10244/head
ulferts 3 years ago
parent f8075eaf9e
commit 17e242011a
No known key found for this signature in database
GPG Key ID: A205708DE1284017
  1. 17
      modules/reporting/lib/widget/settings.rb
  2. 58
      modules/reporting/lib/widget/settings_patch.rb

@ -43,6 +43,14 @@ class Widget::Settings < Widget::Base
end
end
def render_cost_types_settings
render_widget Widget::Settings::Fieldset, @subject, type: "units" do
render_widget Widget::CostTypes,
@cost_types,
selected_type_id: @selected_type_id
end
end
def render_controls_settings
content_tag :div, class: 'form--buttons -with-button-form hide-when-print' do
widgets = ''.html_safe
@ -75,7 +83,14 @@ class Widget::Settings < Widget::Base
end)
end
def render_with_options(options, &block)
@cost_types = options.delete(:cost_types)
@selected_type_id = options.delete(:selected_type_id)
super(options, &block)
end
def settings_to_render
@settings_to_render ||= %i[filter group_by controls]
@settings_to_render ||= %i[filter group_by cost_types controls]
end
end

@ -1,58 +0,0 @@
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) 2012-2022 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 Widget::SettingsPatch
extend ActiveSupport::Concern
included do
prepend InstanceMethods
end
module InstanceMethods
def settings_to_render
super.insert(-2, :cost_types)
end
def render_cost_types_settings
render_widget Widget::Settings::Fieldset, @subject, type: "units" do
render_widget Widget::CostTypes,
@cost_types,
selected_type_id: @selected_type_id
end
end
def render_with_options(options, &block)
@cost_types = options.delete(:cost_types)
@selected_type_id = options.delete(:selected_type_id)
super(options, &block)
end
end
end
Widget::Settings.include Widget::SettingsPatch
Loading…
Cancel
Save