Merge pull request #828 from noesya/fix/trees_reorder

Fix trees reorder

app/controllers/admin/communication/websites/pages_controller.rb

@@ -13,6 +13,7 @@ class Admin::Communication::Websites::PagesController < Admin::Communication::We
 
   def reorder
     parent_page = @website.pages.find(params[:parentId])
+    old_parent_page = @website.pages.find(params[:oldParentId])
     ids = params[:ids] || []
     ids.each.with_index do |id, index|
       page = @website.pages.find(id)
@@ -21,6 +22,7 @@ class Admin::Communication::Websites::PagesController < Admin::Communication::We
         position: index + 1
       )
     end
+    old_parent_page.sync_with_git
     parent_page.sync_with_git
   end
 

app/controllers/admin/education/programs_controller.rb

@@ -23,23 +23,24 @@ class Admin::Education::ProgramsController < Admin::Education::ApplicationContro
 
   def reorder
     parent_id = params[:parentId].blank? ? nil : params[:parentId]
+    old_parent_id = params[:oldParentId].blank? ? nil : params[:oldParentId]
     ids = params[:ids] || []
     ids.each.with_index do |id, index|
-      @program = current_university.education_programs.find(id)
-      @program.update(
+      program = current_university.education_programs.find(id)
+      program.update(
         parent_id: parent_id,
         position: index + 1,
         skip_websites_categories_callback: true
       )
     end
-    if parent_id
-      parent = current_university.education_programs.find(parent_id)
-      parent.set_websites_categories
-      parent.sync_with_git
-    else
-      @program&.set_websites_categories
-      @program&.sync_with_git
+    if old_parent_id
+      old_parent = current_university.education_programs.find(old_parent_id)
+      old_parent.set_websites_categories
+      old_parent.sync_with_git
     end
+    program = current_university.education_programs.find(params[:itemId])
+    program.set_websites_categories
+    program.sync_with_git
   end
 
   def children

app/models/communication/website/category.rb

@@ -96,7 +96,7 @@ class Communication::Website::Category < ApplicationRecord
   end
 
   def git_dependencies(website)
-    [self] + siblings + descendants + active_storage_blobs + posts + website.menus
+    [self] + parent + siblings + descendants + active_storage_blobs + posts + website.menus
   end
 
   def git_destroy_dependencies(website)