diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-21 18:49:27 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-21 18:49:27 +0300 |
| commit | b303932ac973822c6c5f1bb20aec6a7729a40145 (patch) | |
| tree | 72eb3f104a1fc82d09415eb82105678a82d94ba1 /app | |
| parent | b5c3ad759342e61a597c32b62151d4ad076d4559 (diff) | |
| parent | 79393a351db47afa0df3588b5cdf9fb254c75282 (diff) | |
Merge branch 'bvl-validate-path-update' into 'master'
Rebuild the dynamic path before validating it
Closes #33746
See merge request !12213
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/routable.rb | 16 | ||||
| -rw-r--r-- | app/validators/dynamic_path_validator.rb | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb index 63d02b76f6b..ec7796a9dbb 100644 --- a/app/models/concerns/routable.rb +++ b/app/models/concerns/routable.rb @@ -107,6 +107,14 @@ module Routable RequestStore[key] ||= uncached_full_path end + def build_full_path + if parent && path + parent.full_path + '/' + path + else + path + end + end + private def uncached_full_path @@ -135,14 +143,6 @@ module Routable end end - def build_full_path - if parent && path - parent.full_path + '/' + path - else - path - end - end - def update_route prepare_route route.save diff --git a/app/validators/dynamic_path_validator.rb b/app/validators/dynamic_path_validator.rb index 27ac60637fd..4688aabc2a8 100644 --- a/app/validators/dynamic_path_validator.rb +++ b/app/validators/dynamic_path_validator.rb @@ -26,7 +26,7 @@ class DynamicPathValidator < ActiveModel::EachValidator end def path_valid_for_record?(record, value) - full_path = record.respond_to?(:full_path) ? record.full_path : value + full_path = record.respond_to?(:build_full_path) ? record.build_full_path : value return true unless full_path |