diff options
| author | Yang Bo <yangbodotnet@gmail.com> | 2015-04-08 22:18:56 +0800 |
|---|---|---|
| committer | Yang Bo <yangbodotnet@gmail.com> | 2015-04-08 22:18:56 +0800 |
| commit | a77de09812eec5f342dd159f053038c6f67e6da4 (patch) | |
| tree | bcfee53c34e625d9e22c0f0cf49a7dcba4573f67 /actionpack/lib | |
| parent | a05f3e5f96f7a8aa55483d91becdbe49b81833fd (diff) | |
| download | rails-a77de09812eec5f342dd159f053038c6f67e6da4.tar.gz rails-a77de09812eec5f342dd159f053038c6f67e6da4.tar.bz2 rails-a77de09812eec5f342dd159f053038c6f67e6da4.zip | |
sort_by instead of sort
it is avoid sort errot within different and mixed keys.
used `sort_by` + `block` to list parameter by keys.
keep minimum changes
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/formatter.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/journey/formatter.rb b/actionpack/lib/action_dispatch/journey/formatter.rb index 992c1a9efe..c0566c6fc9 100644 --- a/actionpack/lib/action_dispatch/journey/formatter.rb +++ b/actionpack/lib/action_dispatch/journey/formatter.rb @@ -39,7 +39,7 @@ module ActionDispatch return [route.format(parameterized_parts), params] end - message = "No route matches #{Hash[constraints.sort].inspect}" + message = "No route matches #{Hash[constraints.sort_by{|k,v| k.to_s}].inspect}" message << " missing required keys: #{missing_keys.sort.inspect}" unless missing_keys.empty? raise ActionController::UrlGenerationError, message diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 0f3734dd74..d0d8ded515 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -226,7 +226,7 @@ module ActionDispatch params = parameterize_args(args) { |missing_key| missing_keys << missing_key } - constraints = Hash[@route.requirements.merge(params).sort] + constraints = Hash[@route.requirements.merge(params).sort_by{|k,v| k.to_s}] message = "No route matches #{constraints.inspect}" message << " missing required keys: #{missing_keys.sort.inspect}" |