diff --git a/server/AyaNova/DataList/DataListSqlFilterOrderByBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterOrderByBuilder.cs index 5ad4bd29..d7bd6757 100644 --- a/server/AyaNova/DataList/DataListSqlFilterOrderByBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlFilterOrderByBuilder.cs @@ -19,6 +19,7 @@ namespace AyaNova.DataList //iterate the datafilter and concatenate a sql query from it // [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}] + bool SortItemAdded = false; for (int i = 0; i < listViewArray.Count; i++) { var cm = listViewArray[i]; @@ -31,8 +32,9 @@ namespace AyaNova.DataList var dir = cm["sort"].Value(); //Get the correct sql column name AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(x => x.FieldKey == fld); - //No sorting on custom fields! - if(DataListField.IsCustomField){ + //No sorting on custom fields! + if (DataListField.IsCustomField) + { continue; } #if (DEBUG) @@ -44,15 +46,15 @@ namespace AyaNova.DataList #endif var SQLValueColumnName = DataListField.GetSqlValueColumnName(); - sb.Append(" "); + if (SortItemAdded) + sb.Append(", "); + else + sb.Append(" "); sb.Append(SQLValueColumnName); sb.Append(" "); sb.Append(dir == "+" ? "ASC" : "DESC"); - if (i < listViewArray.Count - 1) - { - sb.Append(","); - } + SortItemAdded = true; } if (sb.Length == 0)