admin2: fixed sorting issues in several widget gridlists

fixed disappearing text and incorrectly displayed sections for aVehicle aWeapon and aSkin widget gridlists if the user used gridlist sorting; fixed incorrectly set aSetting used to remember 'sort by groups' for aVehicle; unified .Refresh function for aVehicle and aSkin to match aWeapon

Author: Dark-Dragon

[admin]/admin2/client/widgets/admin_skin.lua

@@ -145,10 +145,13 @@ function aSkin.Load()
 end
 
 function aSkin.Refresh()
-    aSetSetting("skinsGroup", guiCheckBoxGetSelected(aSkin.Groups))
-    guiGridListClear(aSkin.List)
+    local groups = guiCheckBoxGetSelected(aSkin.Groups)
     local filter = guiGetText(aSkin.Edit):lower()
-    if (guiCheckBoxGetSelected(aSkin.Groups)) then
+    local sortDirection = guiGetProperty(aSkin.List, "SortDirection")
+    aSetSetting("skinsGroup", groups)
+    guiGridListClear(aSkin.List)
+    guiSetProperty(aSkin.List, "SortDirection", "None")
+    if (groups) then
         local skins = {}
         for name, group in pairs(aSkin.skins) do
             for _, skin in ipairs(group) do
@@ -164,9 +167,7 @@ function aSkin.Refresh()
             local row = guiGridListAddRow(aSkin.List)
             guiGridListSetItemText(aSkin.List, row, 2, name, true, false)
             for id, skin in ipairs(group) do
-                row = guiGridListAddRow(aSkin.List)
-                guiGridListSetItemText(aSkin.List, row, 1, skin.model, false, true)
-                guiGridListSetItemText(aSkin.List, row, 2, skin.name, false, false)
+                guiGridListAddRow(aSkin.List, skin.model, skin.name)
             end
         end
         guiGridListSetSortingEnabled(aSkin.List, false)
@@ -185,5 +186,6 @@ function aSkin.Refresh()
             end
         end
         guiGridListSetSortingEnabled(aSkin.List, true)
+        guiSetProperty(aSkin.List, "SortDirection", sortDirection)
     end
 end

[admin]/admin2/client/widgets/admin_vehicle.lua

@@ -27,7 +27,7 @@ function aVehicle.Show(player)
         guiCreateInnerImage("client\\images\\search.png", aVehicle.Edit)
 
         aVehicle.Groups = guiCreateCheckBox(0.03, 0.90, 0.70, 0.09, "Sort by groups", false, true, aVehicle.Form)
-        if (aGetSetting("weaponsGroup")) then
+        if (aGetSetting("vehiclesGroup")) then
             guiCheckBoxSetSelected(aVehicle.Groups, true)
         end
 
@@ -141,10 +141,13 @@ function aVehicle.Load()
 end
 
 function aVehicle.Refresh()
-    aSetSetting("weaponsGroup", guiCheckBoxGetSelected(aVehicle.Groups))
-    guiGridListClear(aVehicle.List)
+    local groups = guiCheckBoxGetSelected(aVehicle.Groups)
     local filter = guiGetText(aVehicle.Edit):lower()
-    if (guiCheckBoxGetSelected(aVehicle.Groups)) then
+    local sortDirection = guiGetProperty(aVehicle.List, "SortDirection")
+    aSetSetting("vehiclesGroup", groups)
+    guiGridListClear(aVehicle.List)
+    guiSetProperty(aVehicle.List, "SortDirection", "None")
+    if (groups) then
         local vehicles = {}
         for name, group in pairs(aVehicle.vehicles) do
             for _, vehicle in ipairs(group) do
@@ -160,9 +163,7 @@ function aVehicle.Refresh()
             local row = guiGridListAddRow(aVehicle.List)
             guiGridListSetItemText(aVehicle.List, row, 2, name, true, false)
             for id, vehicle in ipairs(group) do
-                row = guiGridListAddRow(aVehicle.List)
-                guiGridListSetItemText(aVehicle.List, row, 1, vehicle.id, false, true)
-                guiGridListSetItemText(aVehicle.List, row, 2, vehicle.name, false, false)
+                guiGridListAddRow(aVehicle.List, vehicle.id, vehicle.name)
             end
         end
         guiGridListSetSortingEnabled(aVehicle.List, false)
@@ -181,5 +182,6 @@ function aVehicle.Refresh()
             end
         end
         guiGridListSetSortingEnabled(aVehicle.List, true)
+        guiSetProperty(aVehicle.List, "SortDirection", sortDirection)
     end
 end

[admin]/admin2/client/widgets/admin_weapon.lua

@@ -154,8 +154,10 @@ end
 function aWeapon.Refresh()
     local groups = guiCheckBoxGetSelected(aWeapon.Groups)
     local filter = guiGetText(aWeapon.Edit):lower()
+    local sortDirection = guiGetProperty(aWeapon.List, "SortDirection")
     aSetSetting("weaponsGroup", groups)
     guiGridListClear(aWeapon.List)
+    guiSetProperty(aWeapon.List, "SortDirection", "None")
     if (groups) then
         local weapons = {}
         for name, group in pairs(aWeapon.weapons) do
@@ -172,9 +174,7 @@ function aWeapon.Refresh()
             local row = guiGridListAddRow(aWeapon.List)
             guiGridListSetItemText(aWeapon.List, row, 2, name, true, false)
             for id, weapon in ipairs(group) do
-                row = guiGridListAddRow(aWeapon.List)
-                guiGridListSetItemText(aWeapon.List, row, 1, weapon.id, false, true)
-                guiGridListSetItemText(aWeapon.List, row, 2, weapon.name, false, false)
+                guiGridListAddRow(aWeapon.List, weapon.id, weapon.name)
             end
         end
         guiGridListSetSortingEnabled(aWeapon.List, false)
@@ -193,5 +193,6 @@ function aWeapon.Refresh()
             end
         end
         guiGridListSetSortingEnabled(aWeapon.List, true)
+        guiSetProperty(aWeapon.List, "SortDirection", sortDirection)
     end
 end