Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Application install process - Allow to install without collaction

KrzysztofPajakc6db2785988f
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
index f41be6e87..d26162dea 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
@@ -441,9 +441,6 @@ namespace Grand.Business.System.Services.Installation
private async Task CreateTables(string local)
{
- if (string.IsNullOrEmpty(local))
- local = "en";
-
try
{
var connectionString = DataSettingsManager.LoadSettings().ConnectionString;
diff --git a/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs b/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs
index 6853fa7bc..83c4388f7 100644
--- a/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs
+++ b/src/Core/Grand.Domain/Data/Mongo/MongoDBContext.cs
@@ -78,10 +78,16 @@ namespace Grand.Domain.Data.Mongo
public async Task CreateTable(string name, string collation)
{
- var options = new CreateCollectionOptions();
- options.Collation = new Collation(collation);
var database = _database ?? TryReadMongoDatabase();
- await database.CreateCollectionAsync(name, options);
+
+ if (!string.IsNullOrEmpty(collation))
+ {
+ var options = new CreateCollectionOptions();
+ options.Collation = new Collation(collation);
+ await database.CreateCollectionAsync(name, options);
+ }
+ else
+ await database.CreateCollectionAsync(name);
}
diff --git a/src/Web/Grand.Web/App_Data/Resources/supportedcollation.xml b/src/Web/Grand.Web/App_Data/Resources/supportedcollation.xml
index de30ac9ca..2113cd98f 100644
--- a/src/Web/Grand.Web/App_Data/Resources/supportedcollation.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/supportedcollation.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Collations>
+ <Collation Name="-None-">
+ <Value></Value>
+ </Collation>
<Collation Name="Afrikaans">
<Value>af</Value>
</Collation>
diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.cs
index beaef55a2..d96b4fc0a 100644
--- a/src/Web/Grand.Web/Controllers/InstallController.cs
+++ b/src/Web/Grand.Web/Controllers/InstallController.cs
@@ -163,7 +163,8 @@ namespace Grand.Web.Controllers
await DataSettingsManager.SaveSettings(settings);
var installationService = _serviceProvider.GetRequiredService<IInstallationService>();
- await installationService.InstallData(model.AdminEmail, model.AdminPassword, model.Collation, model.InstallSampleData, model.CompanyName, model.CompanyAddress, model.CompanyPhoneNumber, model.CompanyEmail);
+ await installationService.InstallData(model.AdminEmail, model.AdminPassword, model.Collation,
+ model.InstallSampleData, model.CompanyName, model.CompanyAddress, model.CompanyPhoneNumber, model.CompanyEmail);
//reset cache
DataSettingsManager.ResetCache();