Merge pull request #3 from oqtane/master

Sync master
oqtane · May 1, 2020 · c30ee60 · c30ee60
2 parents e627e14 + 922c779
commit c30ee60
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
@@ -75,8 +75,7 @@ protected virtual List<ActionViewModel> GetActions()
         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)

diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -367,7 +367,7 @@ private Installation MigrateModules(InstallConfig install)
                                     }
                                 }
                             }
-                            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;

diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -129,7 +129,14 @@ private List<ModuleDefinition> LoadSiteModuleDefinitions(int siteId)
                         }
                         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