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

Merge pull request #1 from oqtane/master

Browse Source 
Update to match source
This commit is contained in:
SPSeanLong
2020-04-18 12:22:30 -04:00
committed by GitHub
parent 70502cd881 b84db01810
commit 46b205102a
8 changed files with 135 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,10 +348,10 @@ namespace Oqtane.Infrastructure
var user = new User
{
SiteId = site.SiteId,
Username = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser),
Username = Constants.HostUser,
Password = password,
Email = email,
DisplayName = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser),
DisplayName = Constants.HostUser,
};
CreateHostUser(folders, userRoles, roles, users, identityUserManager, user);
tenant.IsInitialized = true;
@ -419,6 +419,7 @@ namespace Oqtane.Infrastructure
{
using (var db = new InstallationContext(connectionString))
{
//check if DbUp was initialized
return TableExists(db, "SchemaVersions");
}
@ -431,6 +432,7 @@ namespace Oqtane.Infrastructure
public static bool TableExists(DbContext context, string schema, string tableName)
{
if (!context.Database.CanConnect()) return false;
var connection = context.Database.GetDbConnection();
if (connection.State.Equals(ConnectionState.Closed))

47
Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs Normal file
View File

@ -0,0 +1,47 @@
using Oqtane.Models;
using Oqtane.Infrastructure;
using System.Collections.Generic;
using Oqtane.Repository;
using Oqtane.Shared;
namespace Oqtane.SiteTemplates
{
public class EmptySiteTemplate : ISiteTemplate
{
private readonly IPermissionRepository _permissionRepository;
public EmptySiteTemplate(IPermissionRepository permissionRepository)
{
_permissionRepository = permissionRepository;
}
public string Name
{
get { return "Empty Site Template"; }
}
public List<PageTemplate> CreateSite(Site site)
{
List<PageTemplate> _pageTemplates = new List<PageTemplate>();
_pageTemplates.Add(new PageTemplate
{
Name = "Home",
Parent = "",
Path = "",
Icon = "home",
IsNavigation = true,
IsPersonalizable = false,
EditMode = false,
PagePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
new Permission(PermissionNames.View, Constants.AllUsersRole, true),
new Permission(PermissionNames.View, Constants.AdminRole, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true)
}),
PageTemplateModules = new List<PageTemplateModule>()
});
return _pageTemplates;
}
}
}

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

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory;
using Oqtane.Extensions;
using Oqtane.Models;
@ -37,6 +38,8 @@ namespace Oqtane.Repository
public void UpdateModuleDefinition(ModuleDefinition moduleDefinition)
{
_db.Entry(moduleDefinition).State = EntityState.Modified;
_db.SaveChanges();
_permissions.UpdatePermissions(moduleDefinition.SiteId, EntityNames.ModuleDefinition, moduleDefinition.ModuleDefinitionId, moduleDefinition.Permissions);
_cache.Remove("moduledefinitions:" + moduleDefinition.SiteId.ToString());
}
@ -90,6 +93,18 @@ namespace Oqtane.Repository
else
{
// existing module definition
if (!string.IsNullOrEmpty(moduledef.Name))
{
moduledefinition.Name = moduledef.Name;
}
if (!string.IsNullOrEmpty(moduledef.Description))
{
moduledefinition.Description = moduledef.Description;
}
if (!string.IsNullOrEmpty(moduledef.Categories))
{
moduledefinition.Categories = moduledef.Categories;
}
if (permissions.Count == 0)
{
_permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledef.ModuleDefinitionId, moduledefinition.Permissions);
@ -166,7 +181,7 @@ namespace Oqtane.Repository
moduledefinition = new ModuleDefinition
{
Name = moduleType.Substring(moduleType.LastIndexOf(".") + 1),
Description = moduleType.Substring(moduleType.LastIndexOf(".") + 1),
Description = "Manage " + moduleType.Substring(moduleType.LastIndexOf(".") + 1),
Categories = ((qualifiedModuleType.StartsWith("Oqtane.Modules.Admin.")) ? "Admin" : ""),
Version = new Version(1, 0, 0).ToString()
};
@ -175,6 +190,10 @@ namespace Oqtane.Repository
moduledefinition.ModuleDefinitionName = qualifiedModuleType;
moduledefinition.ControlTypeTemplate = moduleType + "." + Constants.ActionToken + ", " + typename[1];
moduledefinition.AssemblyName = assembly.FullName.Split(",")[0];
if (string.IsNullOrEmpty(moduledefinition.Categories))
{
moduledefinition.Categories = "Common";
}
if (moduledefinition.Categories == "Admin")
{
moduledefinition.Permissions = new List<Permission>

3
Oqtane.Server/Scripts/Master.00.00.00.sql
View File

@ -40,6 +40,9 @@ GO
CREATE TABLE [dbo].[ModuleDefinition](
[ModuleDefinitionId] [int] IDENTITY(1,1) NOT NULL,
[ModuleDefinitionName] [nvarchar](200) NOT NULL,
[Name] [nvarchar](200) NULL,
[Description] [nvarchar](2000) NULL,
[Categories] [nvarchar](200) NULL,
[CreatedBy] [nvarchar](256) NOT NULL,
[CreatedOn] [datetime] NOT NULL,
[ModifiedBy] [nvarchar](256) NOT NULL,

2
Oqtane.Server/appsettings.json
View File

@ -2,9 +2,9 @@
"ConnectionStrings": {
"DefaultConnection": ""
},
"Runtime" : "Server",
"Installation": {
"DefaultAlias": "",
"HostUser": "",
"HostPassword": "",
"HostEmail": "",
"SiteTemplate": "",