Merge branch 'main' of github.com:noesya/osuny

app/assets/javascripts/admin/plugins/treeview.js

@@ -21,7 +21,8 @@ window.osuny.treeView = {
                 fallbackOnBody: true,
                 swapThreshold: 0.65,
                 onEnd: function (evt) {
-                    var from = evt.from,
+                    var item = evt.item,
+                        from = evt.from,
                         to = evt.to,
                         ids = [],
                         parentId,
@@ -47,8 +48,10 @@ window.osuny.treeView = {
 
                     // call to application
                     $.post(url, {
+                        oldParentId: from.dataset.id,
                         parentId: parentId,
-                        ids: ids
+                        ids: ids,
+                        itemId: item.dataset.id
                     });
                 }
             });

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

@@ -12,22 +12,20 @@ class Admin::Communication::Websites::CategoriesController < Admin::Communicatio
 
   def reorder
     parent_id = params[:parentId].blank? ? nil : params[:parentId]
+    old_parent_id = params[:oldParentId].blank? ? nil : params[:oldParentId]
     ids = params[:ids] || []
-    first_category = nil
     ids.each.with_index do |id, index|
       category = @website.categories.find(id)
-      first_category = category if index == 0
       category.update(
         parent_id: parent_id,
         position: index + 1
       )
     end
-    if parent_id
-      parent = @website.categories.find(parent_id)
-      parent.sync_with_git
-    else
-      first_category&.sync_with_git # Will sync siblings
+    if old_parent_id
+      old_parent = @website.categories.find(old_parent_id)
+      old_parent.sync_with_git
     end
+    @website.categories.find(params[:itemId]).sync_with_git # Will sync siblings
   end
 
   def children

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)

db/schema.rb

@@ -811,12 +811,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_13_083544) do
     t.string "zipcode"
     t.string "city"
     t.string "country"
-    t.string "hal_person_identifier"
-    t.string "hal_doc_identifier"
-    t.string "hal_form_identifier"
     t.string "mastodon"
     t.uuid "language_id", null: false
     t.uuid "original_id"
+    t.string "hal_person_identifier"
+    t.string "hal_doc_identifier"
+    t.string "hal_form_identifier"
     t.index ["language_id"], name: "index_university_people_on_language_id"
     t.index ["original_id"], name: "index_university_people_on_original_id"
     t.index ["university_id"], name: "index_university_people_on_university_id"