kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3180 from sbwalker/dev

Browse Source 
added defensive logic to resolve regression issue caused by #3175
This commit is contained in:
Shaun Walker 2023-08-24 08:10:06 -04:00 committed by GitHub
commit d86c53858e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -145,7 +145,7 @@ namespace Oqtane.Repository
moduledefinition = new ModuleDefinition { ModuleDefinitionName = ModuleDefinition.ModuleDefinitionName, Version = ModuleDefinition.Version }; moduledefinition = new ModuleDefinition { ModuleDefinitionName = ModuleDefinition.ModuleDefinitionName, Version = ModuleDefinition.Version };
_db.ModuleDefinition.Add(moduledefinition); _db.ModuleDefinition.Add(moduledefinition);
_db.SaveChanges(); _db.SaveChanges();
ModuleDefinition.Version = ""; // ensure migrations are executed during startup ModuleDefinition.Version = ""; // ensure migrations are executed during startup for new module installations
} }
else else
{ {
@ -159,7 +159,7 @@ namespace Oqtane.Repository
} }
// manage releaseversions in cases where it was not provided or is lower than the module version // manage releaseversions in cases where it was not provided or is lower than the module version
if (string.IsNullOrEmpty(ModuleDefinition.ReleaseVersions) || Version.Parse(ModuleDefinition.Version).CompareTo(Version.Parse(ModuleDefinition.ReleaseVersions.Split(',').Last())) > 0) if (string.IsNullOrEmpty(ModuleDefinition.ReleaseVersions) || (!string.IsNullOrEmpty(ModuleDefinition.Version) && Version.Parse(ModuleDefinition.Version).CompareTo(Version.Parse(ModuleDefinition.ReleaseVersions.Split(',').Last())) > 0))
{ {
ModuleDefinition.ReleaseVersions = ModuleDefinition.Version; ModuleDefinition.ReleaseVersions = ModuleDefinition.Version;
} }