From 3caa065724e991da046edaf68cb0c3e9ca06ac8d Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 2 Jan 2020 01:34:46 -0600 Subject: [PATCH] revert this change since i'm too tired to figure out what's up with it --- .../categories_and_fields_serializer.rb | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/app/models/serializers/categories_and_fields_serializer.rb b/app/models/serializers/categories_and_fields_serializer.rb index 84546925..6078734b 100644 --- a/app/models/serializers/categories_and_fields_serializer.rb +++ b/app/models/serializers/categories_and_fields_serializer.rb @@ -26,7 +26,26 @@ class CategoriesAndFieldsSerializer old_column_source: field.old_column_source, value: "" } - }).sort { |a, b| a[:position] <=> b[:position] } + }).sort do |a, b| + if a[:position] && b[:position] + a[:position] <=> b[:position] + + else + a_value = case a[:type] + when 'name' then 0 + when 'universe' then 1 + else 2 # 'text_area', 'link' + end + + b_value = case b[:type] + when 'name' then 0 + when 'universe' then 1 + else 2 + end + + a_value <=> b_value + end + end } end