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

Merge pull request #486 from sbwalker/master

Browse Source 
added ability to set default container at the page level, expanded size of role description in upgrade script for 0.9.2
This commit is contained in:
Shaun Walker
2020-05-15 09:49:45 -04:00
committed by GitHub
parent 0ea4c4d723 ac03afb146
commit 51c27ae0e5
10 changed files with 104 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Server/Controllers/PageController.cs
View File

@ -166,6 +166,7 @@ namespace Oqtane.Controllers
page.EditMode = false;
page.ThemeType = parent.ThemeType;
page.LayoutType = parent.LayoutType;
page.DefaultContainerType = parent.DefaultContainerType;
page.Icon = parent.Icon;
page.Permissions = new List<Permission> {
new Permission(PermissionNames.View, userid, true),

2
Oqtane.Server/Oqtane.Server.csproj
View File

@ -19,12 +19,14 @@
<ItemGroup>
<None Remove="Scripts\Tenant.0.9.1.sql" />
<None Remove="Scripts\Tenant.0.9.2.sql" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
<EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
<EmbeddedResource Include="Scripts\Master.0.9.0.sql" />
<EmbeddedResource Include="Scripts\Tenant.0.9.2.sql" />
<EmbeddedResource Include="Scripts\Tenant.0.9.1.sql" />
<EmbeddedResource Include="Scripts\Tenant.0.9.0.sql" />
</ItemGroup>

1
Oqtane.Server/Repository/SiteRepository.cs
View File

@ -757,6 +757,7 @@ namespace Oqtane.Repository
EditMode = pagetemplate.EditMode,
ThemeType = "",
LayoutType = "",
DefaultContainerType = "",
Icon = pagetemplate.Icon,
Permissions = pagetemplate.PagePermissions,
IsPersonalizable = pagetemplate.IsPersonalizable,

2
Oqtane.Server/Scripts/Tenant.0.9.1.sql
View File

@ -1,6 +1,6 @@
/*
migration script
Version 0.9.1 migration script
*/

18
Oqtane.Server/Scripts/Tenant.0.9.2.sql Normal file
View File

@ -0,0 +1,18 @@
/*
Version 0.9.2 migration script
*/
ALTER TABLE [dbo].[Role]
ALTER COLUMN [Description] VARCHAR (256) NOT NULL
GO
ALTER TABLE [dbo].[Page] ADD
[DefaultContainerType] [nvarchar](200) NULL
GO
UPDATE [dbo].[Page]
SET [DefaultContainerType] = ''
GO