Group by tenant for chargeback|metering Vm reports #3380
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mzazrivec
reviewed
Feb 7, 2018
| @@ -139,6 +139,7 @@ | |||
| - opts = [["#{_('Date')}", "date"], ["#{_(@edit[:new][:cb_model])}", "vm"]] | |||
| - opts += [["#{_('Tag')}", "tag"]] unless @edit[:new][:model] == "ChargebackContainerImage" || @edit[:new][:model] == "MeteringContainerImage" | |||
| - opts += [["#{_('Project')}", "project"], [_('Label'), 'label']] if @edit[:new][:model] == "ChargebackContainerImage" || @edit[:new][:model] == "MeteringContainerImage" | |||
| - opts += [["#{_('Tenant')}", "tenant"]] if @edit[:new][:model] == "ChargebackVm" || @edit[:new][:model] == "MeteringVm" | |||
There was a problem hiding this comment.
%w(ChargebackVm MeteringVm).include?(@edit[:new][:model])
lpichler
force-pushed
the
add_grouping_by_tenant_in_chargeback_reports
branch
from
11d85d6
to
0b1ab90
Compare
|
Checked commit lpichler@0b1ab90 with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0 **
|
1 task
|
@lpichler Where's the backend PR for this? |
|
@mzazrivec backend PR ManageIQ/manageiq#17002 (the PR is done). |
|
@miq-bot add_label gaprindashvili/yes |
simaishi
pushed a commit
that referenced
this pull request
Mar 8, 2018
…geback_reports Group by tenant for chargeback|metering Vm reports (cherry picked from commit e87766a) https://bugzilla.redhat.com/show_bug.cgi?id=1552796
|
Gaprindashvili backport details: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add options group by tenant to the highlighted options.
Links
@miq-bot add_label enhancement
@miq-bot assign @mzazrivec