Skip to content

Commit 8ce1c20

Browse files
author
Leonid
committed
Fixes
1 parent c87c5a4 commit 8ce1c20

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static List<IEformPlugin> GetPlugins(IConfiguration configuration)
3939
var eformPlugin = eformPlugins.FirstOrDefault(x => x.PluginId == plugin.PluginId);
4040
if (eformPlugin != null)
4141
{
42-
if (eformPlugin.Status == PluginStatus.Enabled)
42+
if (eformPlugin.Status == (int) PluginStatus.Enabled)
4343
{
4444
plugins.Add(plugin);
4545
}
@@ -50,7 +50,7 @@ public static List<IEformPlugin> GetPlugins(IConfiguration configuration)
5050
{
5151
PluginId = plugin.PluginId,
5252
ConnectionString = "...",
53-
Status = PluginStatus.Disabled
53+
Status = (int) PluginStatus.Disabled
5454
});
5555
}
5656
}

eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/EformPermission.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ public class EformPermission : BaseEntity
99

1010
public int EformInGroupId { get; set; }
1111
public virtual EformInGroup EformInGroup { get; set; }
12-
1312
}
1413
}

eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/EformPlugin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ public class EformPlugin : BaseEntity
1212

1313
public string ConnectionString { get; set; }
1414

15-
public PluginStatus Status { get; set; }
15+
public int Status { get; set; }
1616
}
1717
}

eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/EformReportDataItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ public class EformReportDataItem : BaseEntity
1313
public bool Visibility { get; set; }
1414

1515
public int EformReportElementId { get; set; }
16-
public EformReportElement EformReportElement { get; set; }
16+
public virtual EformReportElement EformReportElement { get; set; }
1717

1818
public int? ParentId { get; set; }
19-
public EformReportDataItem Parent { get; set; }
19+
public virtual EformReportDataItem Parent { get; set; }
2020

2121
public virtual ICollection<EformReportDataItem> NestedDataItems { get; set; }
2222
}

eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/EformReportElement.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public class EformReportElement : BaseEntity
1212
public int ElementId { get; set; }
1313

1414
public int EformReportId { get; set; }
15-
public EformReport EformReport { get; set; }
15+
public virtual EformReport EformReport { get; set; }
1616

1717
public int? ParentId { get; set; }
18-
public EformReportElement Parent { get; set; }
18+
public virtual EformReportElement Parent { get; set; }
1919

2020
public virtual ICollection<EformReportElement> NestedElements { get; set; }
2121
public virtual ICollection<EformReportDataItem> DataItems { get; set; }

eFormAPI/eFormAPI.Web/Infrastructure/Database/Factories/BaseDbContextFactory.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public BaseDbContext CreateDbContext(string[] args)
2525
{
2626
optionsBuilder.UseSqlServer("...");
2727
}
28+
29+
optionsBuilder.UseLazyLoadingProxies();
2830
return new BaseDbContext(optionsBuilder.Options);
2931
}
3032
}

eFormAPI/eFormAPI.Web/Services/PluginsSettingsService.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Linq;
33
using System.Threading.Tasks;
44
using eFormAPI.Web.Abstractions;
5+
using eFormAPI.Web.Hosting.Enums;
56
using eFormAPI.Web.Hosting.Helpers;
67
using eFormAPI.Web.Infrastructure.Database;
78
using eFormAPI.Web.Infrastructure.Models.Plugins;
@@ -45,7 +46,7 @@ public async Task<OperationDataResult<PluginsSettingsModel>> GetPlugins(
4546
Id = eformPlugin.Id,
4647
PluginId = eformPlugin.PluginId,
4748
ConnectionString = eformPlugin.ConnectionString,
48-
Status = eformPlugin.Status,
49+
Status = (PluginStatus) eformPlugin.Status,
4950
Name = loadedPlugin.Name,
5051
Version = loadedPlugin.PluginAssembly().GetName().Version.ToString(),
5152
};
@@ -78,7 +79,7 @@ public async Task<OperationResult> UpdatePluginSettings(PluginsSettingsUpdateMod
7879
}
7980

8081
eformPlugin.ConnectionString = updateModel.ConnectionString;
81-
eformPlugin.Status = updateModel.Status;
82+
eformPlugin.Status = (int) updateModel.Status;
8283
_dbContext.EformPlugins.Update(eformPlugin);
8384
await _dbContext.SaveChangesAsync();
8485
Program.Restart();

0 commit comments

Comments
 (0)