From b4853777eade5c5f98ec90f1e8bc8cfd21b1c63a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 17 Jan 2020 20:53:46 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/ObjectFields.cs     | 10 +---------
 server/AyaNova/biz/SqlSelectBuilder.cs |  9 ++++++---
 server/AyaNova/biz/WidgetBiz.cs        | 11 ++++++-----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs
index e0ed027a..51f04f03 100644
--- a/server/AyaNova/biz/ObjectFields.cs
+++ b/server/AyaNova/biz/ObjectFields.cs
@@ -221,15 +221,7 @@ namespace AyaNova.Biz
                 #endregion
                 case TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY:
                     #region WIDGET_USER_EMAIL_ADDRESS_LIST_KEY
-                    /*
-                    Select awidget.id, awidget.name, auser.name, auser.id, auseroptions.emailaddress
-from awidget
-left outer join auser on (awidget.userid=auser.id)
-left outer join auseroptions on (auser.id=auseroptions.userid)
-order by auseroptions.emailaddress desc
-                    */
-
-
+                  
                     l.Add(new AyaField { LtKey = "df", AyaObjectType = (int)AyaType.Widget, SqlIdColumnName = "awidget.id" });
                     l.Add(new AyaField
                     {
diff --git a/server/AyaNova/biz/SqlSelectBuilder.cs b/server/AyaNova/biz/SqlSelectBuilder.cs
index 2fb7b62b..0f46228a 100644
--- a/server/AyaNova/biz/SqlSelectBuilder.cs
+++ b/server/AyaNova/biz/SqlSelectBuilder.cs
@@ -69,12 +69,15 @@ namespace AyaNova.Biz
                     sb.Append(", ");
                     sb.Append(o.GetSqlDisplayColumnName());
 
+                    //does it also have an ID column?
+                    if (!string.IsNullOrWhiteSpace(o.SqlIdColumnName))
+                    {
+                        sb.Append(", ");
+                        sb.Append(o.SqlIdColumnName);
+                    }
                 }
             }
 
-
-
-
             return sb.ToString();
         }
 
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index 0fa64bf8..440c76da 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -417,11 +417,12 @@ namespace AyaNova.Biz
             ";
 
             //BUILD THE QUERY           
- /*
-                    Select awidget.id as df, awidget.id as widgetid, awidget.name as widgetname, auser.name as username, auser.id as userid, auseroptions.emailaddress
-                    from awidget
-                    left outer join auser on (awidget.userid=auser.id)
-                    left outer join auseroptions on (auser.id=auseroptions.userid)
+  /*
+                    Select awidget.id, awidget.name, auser.name, auser.id, auseroptions.emailaddress
+from awidget
+left outer join auser on (awidget.userid=auser.id)
+left outer join auseroptions on (auser.id=auseroptions.userid)
+order by auseroptions.emailaddress desc
                     */
             //SELECT FRAGMENT COLUMNS FROM TEMPLATE
             //"select clm,clm,clm"