File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed
actionpack/lib/action_dispatch/routing Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -580,11 +580,13 @@ def define_generate_prefix(app, name)
580
580
app . routes . define_mounted_helper ( name )
581
581
app . routes . extend Module . new {
582
582
def mounted? ; true ; end
583
- define_method :_generate_prefix do |options |
583
+ define_method :find_script_name do |options |
584
+ super ( options ) || begin
584
585
prefix_options = options . slice ( *_route . segment_keys )
585
586
# we must actually delete prefix segment keys to avoid passing them to next url_for
586
587
_route . segment_keys . each { |k | options . delete ( k ) }
587
588
_routes . url_helpers . send ( "#{ name } _path" , prefix_options )
589
+ end
588
590
end
589
591
}
590
592
end
Original file line number Diff line number Diff line change @@ -641,8 +641,8 @@ def optimize_routes_generation?
641
641
!mounted? && default_url_options . empty?
642
642
end
643
643
644
- def _generate_prefix ( options )
645
- nil
644
+ def find_script_name ( options )
645
+ options . delete :script_name
646
646
end
647
647
648
648
# The +options+ argument must be a hash whose keys are *symbols*.
@@ -659,7 +659,7 @@ def url_for(options)
659
659
recall = options . delete ( :_recall )
660
660
661
661
original_script_name = options . delete ( :original_script_name )
662
- script_name = options . delete ( :script_name ) || _generate_prefix ( options )
662
+ script_name = find_script_name options
663
663
664
664
if script_name && original_script_name
665
665
script_name = original_script_name + script_name
You can’t perform that action at this time.
0 commit comments