Merge branch 'dz-fix-route-rename-descendants' into 'master'

Fix route rename descendants if route.name is blank

See merge request !9074

1 files changed, 10 insertions, 5 deletions

diff --git a/app/models/route.rb b/app/models/route.rb
index 4eec3e73d5b..73574a6206b 100644
--- a/app/models/route.rb
+++ b/app/models/route.rb
@@ -15,14 +15,19 @@ class Route < ActiveRecord::Base
       descendants = Route.where('path LIKE ?', "#{path_was}/%")
 
       descendants.each do |route|
-        attributes = {
-          path: route.path.sub(path_was, path),
-          name: route.name.sub(name_was, name)
-        }
+        attributes = {}
+
+        if path_changed? && route.path.present?
+          attributes[:path] = route.path.sub(path_was, path)
+        end
+
+        if name_changed? && route.name.present?
+          attributes[:name] = route.name.sub(name_was, name)
+        end
 
         # Note that update_columns skips validation and callbacks.
         # We need this to avoid recursive call of rename_descendants method
-        route.update_columns(attributes)
+        route.update_columns(attributes) unless attributes.empty?
       end
     end
   end