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.

Sign up for GitHub

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

Chargeback Rates non explorer #7039

Merged
merged 18 commits into from
May 19, 2020
Merged

Chargeback Rates non explorer #7039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c083fc0
Converted chargeback rates explorer into non-explorer
h-kataria May 9, 2020
0fbdb08
Fixed an issue to show flash message when trying to edit default rate
h-kataria May 13, 2020
67c3abf
changed to render tree directly into show_list partial
h-kataria May 15, 2020
c59b978
set chargeback rates specific items in it's own tree
h-kataria May 15, 2020
c21e705
Addressed buttons related PR feedback
h-kataria May 15, 2020
23884bf
Simplified javascript_redirect calls
h-kataria May 15, 2020
67f8ef2
use `get_record_display_name` to get name/desciption of a record
h-kataria May 15, 2020
b85a562
Removed accidentally committed debugging statement
h-kataria May 15, 2020
ae4dbbf
Made tree building code generic
h-kataria May 16, 2020
1f3cfe3
An attempt to simplify setup and usage of `@gtl_buttons`
h-kataria May 16, 2020
0a4ced8
Moved code to determine toolbar file name to use `GenericToolbarMixin`
h-kataria May 18, 2020
750b140
Removed chargeback rates tree view as per GH discussion/comment
h-kataria May 18, 2020
1e81bda
Deleted Chargeback Rates tree builder files
h-kataria May 18, 2020
b98126b
Fixed spec tests
h-kataria May 18, 2020
7922c22
Deleted leftover tree view code
h-kataria May 19, 2020
f78f984
Removed redundant routes
h-kataria May 19, 2020
bf3fb4d
simplified routes and adjusted method names accordingly
h-kataria May 19, 2020
5e9422a
changed textfield to use `data-miq_focus` instead
h-kataria May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/application_controller/report_downloads.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def set_summary_pdf_data
:page_layout => "portrait",
:page_size => "us-letter",
:run_date => run_time.strftime("%m/%d/%y %l:%m %p %z"),
:title => "#{klass} \"#{@record.name}\"".html_safe,
:title => "#{klass} \"#{get_record_display_name(@record)}\"".html_safe,
:quadicon => true
}

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/chargeback_assignment_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def replace_right_cell(options = {})
presenter.show(:paging_div, :form_buttons_div).remove_paging
locals = {:record_id => @edit[:rec_id]}
if x_active_tree == :cb_rates_tree
locals[:action_url] = 'cb_rate_edit'
locals[:action_url] = 'edit'
else
locals.update(
:action_url => 'cb_assign_update',
Expand Down
Loading