Skip to content

Commit

Permalink
fix broken link from rateplan to destinations. closes #1100 (#1149)
Browse files Browse the repository at this point in the history
* fix broken link from rateplan to destinations. closes #1100
  • Loading branch information
dmitry-sinina committed Jun 26, 2022
1 parent 0b429dd commit b6fdcc8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions app/admin/routing/destinations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
filter :prefix
filter :routing_for_contains, as: :string, input_html: { class: 'search_filter_string' }
filter :rate_group, input_html: { class: 'chosen' }
filter :rate_group_rateplans_id_eq, as: :select, input_html: { class: 'chosen' }, label: 'Rateplan', collection: -> { Routing::Rateplan.all }
filter :reject_calls, as: :select, collection: [['Yes', true], ['No', false]]
filter :initial_rate
filter :next_rate
Expand Down
5 changes: 1 addition & 4 deletions app/admin/routing/rateplans.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,11 @@
sidebar :links, only: %i[show edit] do
ul do
li do
link_to 'Destinations', destinations_path(q: { rateplan_id_eq: params[:id] })
link_to 'Destinations', destinations_path(q: { rate_group_rateplans_id_eq: params[:id] })
end
li do
link_to 'Customer Auths', customers_auths_path(q: { rateplan_id_eq: params[:id] })
end
li do
link_to 'CDR list', cdrs_path(q: { rateplan_id_eq: params[:id] })
end
end
end
end
6 changes: 3 additions & 3 deletions spec/features/reports/custom_cdrs/new_custom_cdr_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
let(:fill_form!) do
fill_in_chosen 'Group by', with: 'customer_id', no_search: true
within_form_for { click_link 'Set range' }
within('.block_timerange') { click_on_text 'This Week' }
within('.block_timerange') { click_on_text 'This Month' }
end
let(:expected_service_params) do
{
date_start: Time.zone.now.beginning_of_week,
date_end: Time.zone.now.next_week,
date_start: Time.zone.now.beginning_of_month,
date_end: Time.zone.now.next_month.beginning_of_month,
group_by: %w[customer_id],
filter: nil,
customer: nil,
Expand Down

0 comments on commit b6fdcc8

Please sign in to comment.