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

Merge pull request #652 from sbwalker/master

Browse Source 
remove line feeds from content during import
This commit is contained in:
Shaun Walker 2020-07-09 08:46:50 -04:00 committed by GitHub
commit bce262cd8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Oqtane.Server/Repository/ModuleRepository.cs
View File

@ -123,7 +123,7 @@ namespace Oqtane.Repository
ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault(); ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault();
if (moduledefinition != null) if (moduledefinition != null)
{ {
ModuleContent modulecontent = JsonSerializer.Deserialize<ModuleContent>(content); ModuleContent modulecontent = JsonSerializer.Deserialize<ModuleContent>(content.Replace("\n", ""));
if (modulecontent.ModuleDefinitionName == moduledefinition.ModuleDefinitionName) if (modulecontent.ModuleDefinitionName == moduledefinition.ModuleDefinitionName)
{ {
if (moduledefinition.ServerManagerType != "") if (moduledefinition.ServerManagerType != "")
@ -147,9 +147,10 @@ namespace Oqtane.Repository
} }
} }
} }
catch catch (Exception ex)
{ {
// error occurred during import // error occurred during import
string error = ex.Message;
} }
return success; return success;