Diplomarbeit-Absolventenverein/oqtane.framework
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed module action import/export, improved module installation

Browse Source
This commit is contained in:
Shaun Walker 2020-05-01 15:58:34 -04:00
parent 3afa489f22
commit 45aeb17020
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
View File

@ -75,8 +75,7 @@ namespace Oqtane.Themes.Controls
private async Task<string> EditUrlAsync(string url, int moduleId, string import)
{
await Task.Yield();
EditUrl(moduleId, import);
return url;
return EditUrl(moduleId, import);
}
protected async Task ModuleAction(ActionViewModel action)

2
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -367,7 +367,7 @@ namespace Oqtane.Infrastructure
}
}
}
if (moduledefinition.Version != versions[versions.Length - 1])
if (string.IsNullOrEmpty(result.Message) && moduledefinition.Version != versions[versions.Length - 1])
{
moduledefinition.Version = versions[versions.Length - 1];
db.Entry(moduledefinition).State = EntityState.Modified;

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

@ -129,7 +129,14 @@ namespace Oqtane.Repository
}
else
{
moduledefinition.Permissions = permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId).EncodePermissions();
if (permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId).Any())
{
moduledefinition.Permissions = permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId).EncodePermissions();
}
else
{
_permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledef.ModuleDefinitionId, moduledefinition.Permissions);
}
}
}
// remove module definition from list as it is already synced