Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optional chargeback allocated calculation #1738

Merged

Conversation

lpichler
Copy link
Contributor

Adding the parameter to report definition to be able to select another method for chargeback calculation.

screen shot 2017-07-21 at 15 32 22

Links

cc @gtanzillo
@miq-bot assign @himdel

@miq_bot add_label enhancement

@@ -1295,6 +1299,7 @@ def set_form_vars

# @edit[:new][:cb_include_metrics] = nil - it means YES (YES is default value for new and legacy reports)
@edit[:new][:cb_include_metrics] = options[:include_metrics].nil? || options[:include_metrics]
@edit[:new][:method_for_allocated_metrics] = options[:method_for_allocated_metrics].try(:to_sym) || DEFAULT_CHARGEBACK_ALLOCATED_METHOD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_() needs to be applied to the values of the CHAREGEBACK_ALLOCATED_METHODS hash for i18n
to really work here (same in the rest of this PR).

@lpichler lpichler force-pushed the optionable_allocated_calculation_ui branch from 3571b4f to d37a04f Compare August 7, 2017 11:41
@miq-bot
Copy link
Member

miq-bot commented Aug 7, 2017

Checked commits lpichler/manageiq-ui-classic@f5a4bcc~...d37a04f with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
3 files checked, 2 offenses detected

app/controllers/report_controller/reports/editor.rb

app/helpers/ui_constants.rb

@lpichler
Copy link
Contributor Author

lpichler commented Aug 7, 2017

@mzazrivec @martinpovolny

@mzazrivec mzazrivec added this to the Sprint 67 Ending Aug 21, 2017 milestone Aug 10, 2017
@mzazrivec mzazrivec merged commit 3ffd639 into ManageIQ:master Aug 10, 2017
@lpichler lpichler deleted the optionable_allocated_calculation_ui branch August 10, 2017 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants