From c0b1ded363b9b6c76849e888297f9eab4be87af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Sat, 1 Oct 2022 22:02:01 -0400
Subject: [PATCH] fix more categories button not moving with parent

fix order issue
---
 public/src/admin/manage/categories.js               |  8 ++++++--
 .../admin/partials/categories/category-rows.tpl     | 13 +++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index cae9f782ca..0c541a1438 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -202,7 +202,7 @@ define('admin/manage/categories', [
 			// this makes sure order is correct when drag & drop is used on pages > 1
 			const baseIndex = (ajaxify.data.pagination.currentPage - 1) * ajaxify.data.categoriesPerPage;
 			modified[cid] = {
-				order: baseIndex + e.newIndex + 1,
+				order: baseIndex + e.newIndex,
 			};
 
 			if (isCategoryUpdate) {
@@ -263,7 +263,11 @@ define('admin/manage/categories', [
 				categories: categories,
 				parentCategory: parentCategory,
 			}, function (html) {
-				container.append(html);
+				if (container.find('.category-row').length) {
+					container.find('.category-row').after(html);
+				} else {
+					container.append(html);
+				}
 
 				// Disable expand toggle
 				if (!categories.length) {
diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tpl
index 7df4bd7c45..6c36ff81d9 100644
--- a/src/views/admin/partials/categories/category-rows.tpl
+++ b/src/views/admin/partials/categories/category-rows.tpl
@@ -49,11 +49,12 @@
                 </div>
             </div>
         </div>
+
+        <ul class="list-unstyled has-more-categories {{{ if !../hasMoreSubCategories}}}hidden{{{ end }}}">
+            <li>
+                <a href="{config.relative_path}/admin/manage/categories?cid={categories.cid}&page={categories.showMorePage}" class="btn btn-outline-secondary">[[category:x-more-categories, {../subCategoriesLeft}]]</a>
+            </li>
+        </ul>
     </li>
-    {{{ if ../hasMoreSubCategories}}}
-    <li>
-	    <a href="{config.relative_path}/admin/manage/categories?cid={categories.cid}&page={categories.showMorePage}" class="btn btn-default">[[category:x-more-categories, {../subCategoriesLeft}]]</a>
-    </li>
-	{{{ end }}}
-<!-- END categories -->
+{{{ end }}}
 </ul>