Updating:

- Microting.eForm to 3.0.87
- Microting.eFormApi.BasePn to 1.1.46

Author: renemadsen

eFormAPI/eFormAPI/Controllers/TemplateColumnsController.cs

@@ -6,6 +6,7 @@
 using eFormApi.BasePn.Infrastructure;
 using eFormApi.BasePn.Infrastructure.Helpers;
 using eFormApi.BasePn.Infrastructure.Models.API;
+using eFormShared;
 
 namespace eFormAPI.Web.Controllers
 {
@@ -20,8 +21,8 @@ public OperationDataResult<List<TemplateColumnModel>> GetAvailableColumns(int te
         {
             try
             {
-                var core = _coreHelper.GetCore();
-                var fields = core.Advanced_TemplateFieldReadAll(templateId);
+                eFormCore.Core core = _coreHelper.GetCore();
+                List<Field_Dto> fields = core.Advanced_TemplateFieldReadAll(templateId);
                 List<TemplateColumnModel> templateColumns = new List<TemplateColumnModel>();
                 foreach (var field in fields)
                 {
@@ -33,7 +34,7 @@ public OperationDataResult<List<TemplateColumnModel>> GetAvailableColumns(int te
                         templateColumns.Add(new TemplateColumnModel()
                         {
                             Id = field.Id,
-                            Label = field.Label
+                            Label = field.ParentName + " - " + field.Label
                         });
                 }
                 //List<TemplateColumnModel> templateColumns = fields.Select(field => new TemplateColumnModel()

eFormAPI/eFormAPI/eFormAPI.Web.csproj

@@ -133,11 +133,11 @@
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eForm, Version=3.0.62.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.3.0.62\lib\net45\Microting.eForm.dll</HintPath>
+    <Reference Include="Microting.eForm, Version=3.0.87.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.3.0.87\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eFormApi.BasePn, Version=1.1.43.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eFormApi.BasePn.1.1.43\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>
+    <Reference Include="Microting.eFormApi.BasePn, Version=1.1.46.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eFormApi.BasePn.1.1.46\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>

eFormAPI/eFormAPI/packages.config

@@ -38,8 +38,8 @@
   <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Microting.eForm" version="3.0.62" targetFramework="net461" />
-  <package id="Microting.eFormApi.BasePn" version="1.1.43" targetFramework="net461" />
+  <package id="Microting.eForm" version="3.0.87" targetFramework="net461" />
+  <package id="Microting.eFormApi.BasePn" version="1.1.46" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.12" targetFramework="net461" />
   <package id="MySql.Data.Entity" version="6.9.12" targetFramework="net461" />