Merge pull request #8763 from kbrock/chargeback_dates

Give chargeback users sorting by date and project

Author: Fryguy

app/views/report/_form_filter_chargeback.html.haml

@@ -156,7 +156,9 @@
     %label.control-label.col-md-2
       = _('Group by')
     .col-md-8
-      - opts = [[(_("Date and %{chargeback_model}")  % {:chargeback_model => @edit[:new][:cb_model]} ), "date"], ["#{_('Date Only')}", "date-only"]]
+      - opts =  [[(_("%{chargeback_model} and Date") % {:chargeback_model => @edit[:new][:cb_model]} ), "date"]]
+      - opts += [[(_("Date and %{chargeback_model}") % {:chargeback_model => @edit[:new][:cb_model]} ), "date-first"]]
+      - opts += [["#{_('Date Only')}", "date-only"]]
       - opts += [["#{_('Tag')}", "tag"]] unless @edit[:new][:model] == "ChargebackContainerImage" || @edit[:new][:model] == "MeteringContainerImage"
       - opts += [["#{_('Project')}", "project"], [_('Label'), 'label'], ["#{_('Tag')}", "tag"]] if @edit[:new][:model] == "ChargebackContainerImage" || @edit[:new][:model] == "MeteringContainerImage"
       - opts += [["#{_('Tenant')}", "tenant"]] if %w(ChargebackVm MeteringVm).include?(@edit[:new][:model])