Allow control the source of field in portal indiv. (#211)

Co-authored-by: korpinz <45260016+korpinz@users.noreply.github.com>
fuzzzerd · Jun 5, 2023 · f3402ee · f3402ee
1 parent d673917
commit f3402ee
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/FMData.Rest/FileMakerRestClient.cs b/src/FMData.Rest/FileMakerRestClient.cs
@@ -1144,10 +1144,23 @@ private static T ConvertJTokenToInstance<T>(Func<T, int, object> fmId, Func<T, i
                     {
                         foreach (var jp in jo.Properties().ToList())
                         {
-                            if (jp.Name.Contains(portalDataAttr.TablePrefixFieldNames + "::"))
+                            if (portalDataAttr.SkipPrefix)
                             {
-                                jo.Add(jp.Name.Replace(portalDataAttr.TablePrefixFieldNames + "::", ""), jp.Value);
-                                jo.Remove(jp.Name);
+                                int index;
+                                if (jp.Name.Contains("::"))
+                                {
+                                    index = jp.Name.IndexOf(':') + 2;
+                                    jo.Add(jp.Name.Replace(jp.Name.Substring(0, index), ""), jp.Value);
+                                    jo.Remove(jp.Name);
+                                }
+                            }
+                            else
+                            {
+                                if (jp.Name.Contains(portalDataAttr.TablePrefixFieldNames + "::"))
+                                {
+                                    jo.Add(jp.Name.Replace(portalDataAttr.TablePrefixFieldNames + "::", ""), jp.Value);
+                                    jo.Remove(jp.Name);
+                                }
                             }
                         }
                     }

diff --git a/src/FMData/PortalDataAttribute.cs b/src/FMData/PortalDataAttribute.cs
@@ -16,6 +16,11 @@ public class PortalDataAttribute : System.Attribute
         /// </summary>
         public string TablePrefixFieldNames { get; set; }
 
+        /// <summary>
+        /// Allow to control the source of each field in the portal individually
+        /// </summary>
+        public bool SkipPrefix { get; set; }
+
         /// <summary>
         /// Constructor for Attribute
         /// </summary>