Make ColumnId fallback to ExpressionString

jehhynes · jehhynes · commit 87e110af4aab · 2024-08-22T15:19:57.000-04:00
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.7.5")]
-[assembly: AssemblyFileVersion("3.7.5")]
+[assembly: AssemblyVersion("3.7.6")]
+[assembly: AssemblyFileVersion("3.7.6")]
 //[assembly: AssemblyInformationalVersion("2.5-filters")]
diff --git a/Griddly.Mvc/GriddlyColumn.cs b/Griddly.Mvc/GriddlyColumn.cs
@@ -20,7 +20,11 @@ public GriddlyColumn(LambdaExpression expression, string caption, string columnI
     {
         Expression = expression;
         Caption = caption;
-        ColumnId = columnId != null ? columnId : expression != null ? GetIdFromExpression(expression) : Caption;
+
+        ColumnId = columnId != null ? columnId
+         : expression != null ? GetIdFromExpression(expression)
+         : !string.IsNullOrEmpty(ExpressionString) ? ExpressionString
+         : Caption;
     }
 
     string GetIdFromExpression(LambdaExpression expression)

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,11 @@ public GriddlyColumn(LambdaExpression expression, string caption, string columnI`
`20`	`20`	`{`
`21`	`21`	`Expression = expression;`
`22`	`22`	`Caption = caption;`
`23`		`- ColumnId = columnId != null ? columnId : expression != null ? GetIdFromExpression(expression) : Caption;`
	`23`	`+`
	`24`	`+ ColumnId = columnId != null ? columnId`
	`25`	`+ : expression != null ? GetIdFromExpression(expression)`
	`26`	`+ : !string.IsNullOrEmpty(ExpressionString) ? ExpressionString`
	`27`	`+ : Caption;`
`24`	`28`	`}`
`25`	`29`
`26`	`30`	`string GetIdFromExpression(LambdaExpression expression)`