Skip to content

Commit 0bc3741

Browse files
iJungleboyiJungleboy
authored
Merge pull request #3736 from 2sic/develop
21.04
2 parents 584d7c7 + 3f7a566 commit 0bc3741

77 files changed

Lines changed: 2825 additions & 713 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Src/Data/App_Data/system/bundles/system-settings.json‎

Lines changed: 1579 additions & 200 deletions
Large diffs are not rendered by default.

‎Src/Data/App_Data/system/bundles/system.json‎

Lines changed: 178 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9926,7 +9926,7 @@
99269926
"Metadata": [
99279927
{
99289928
"Id": 184324,
9929-
"Version": 1,
9929+
"Version": 2,
99309930
"Guid": "3ea2c591-de9e-4784-b218-4cf29e5613ee",
99319931
"Type": {
99329932
"Id": "ContentType",
@@ -9947,7 +9947,7 @@
99479947
"en-us": "<p>Configure settings for generating data models - both typed and lightweight.</p>"
99489948
},
99499949
"Label": {
9950-
"en-us": "Data Copilot Configuration"
9950+
"en-us": "Code Generator / Copilot Configuration"
99519951
},
99529952
"ListInstructions": {
99539953
"en-us": ""
@@ -11343,6 +11343,182 @@
1134311343
"Owner": "unknown"
1134411344
}
1134511345
]
11346+
},
11347+
{
11348+
"Name": "GroupAdvanced",
11349+
"Type": "Empty",
11350+
"InputType": "empty-default",
11351+
"IsTitle": false,
11352+
"Metadata": [
11353+
{
11354+
"Id": 185425,
11355+
"Version": 4,
11356+
"Guid": "0c980309-1e5b-4d92-aa76-c40e955430ab",
11357+
"Type": {
11358+
"Id": "@All",
11359+
"Name": "@All"
11360+
},
11361+
"Attributes": {
11362+
"String": {
11363+
"CustomJavaScript": {
11364+
"en-us": ""
11365+
},
11366+
"DefaultValue": {
11367+
"en-us": ""
11368+
},
11369+
"InputType": {
11370+
"en-us": "empty-default"
11371+
},
11372+
"Name": {
11373+
"en-us": "Advanced (BETA)"
11374+
},
11375+
"Notes": {
11376+
"en-us": "<p>These features are experimental and probably don't work yet.</p>"
11377+
},
11378+
"Placeholder": {
11379+
"en-us": ""
11380+
},
11381+
"ValidationRegExJavaScript": {
11382+
"en-us": ""
11383+
}
11384+
},
11385+
"Entity": {
11386+
"Errors": {
11387+
"*": []
11388+
},
11389+
"Formulas": {
11390+
"*": []
11391+
},
11392+
"Warnings": {
11393+
"*": []
11394+
}
11395+
},
11396+
"Boolean": {
11397+
"Disabled": {
11398+
"en-us": false
11399+
},
11400+
"DisableTranslation": {
11401+
"en-us": false
11402+
},
11403+
"Required": {
11404+
"en-us": false
11405+
},
11406+
"VisibleInEditUI": {
11407+
"en-us": true
11408+
}
11409+
}
11410+
},
11411+
"Owner": "unknown"
11412+
},
11413+
{
11414+
"Id": 185427,
11415+
"Version": 3,
11416+
"Guid": "d0d6962e-329a-4e87-9649-d8dd4824d2f3",
11417+
"Type": {
11418+
"Id": "@empty-default",
11419+
"Name": "@empty-default"
11420+
},
11421+
"Attributes": {
11422+
"Boolean": {
11423+
"DefaultCollapsed": {
11424+
"en-us": true
11425+
}
11426+
}
11427+
},
11428+
"Owner": "dnn:userid=41"
11429+
}
11430+
]
11431+
},
11432+
{
11433+
"Name": "AutoGenerate",
11434+
"Type": "Boolean",
11435+
"InputType": "boolean-default",
11436+
"IsTitle": false,
11437+
"Metadata": [
11438+
{
11439+
"Id": 185426,
11440+
"Version": 2,
11441+
"Guid": "af9affc8-309e-4c07-a9e3-7f9253facdfb",
11442+
"Type": {
11443+
"Id": "@All",
11444+
"Name": "@All"
11445+
},
11446+
"Attributes": {
11447+
"String": {
11448+
"CustomJavaScript": {
11449+
"en-us": ""
11450+
},
11451+
"DefaultValue": {
11452+
"en-us": ""
11453+
},
11454+
"InputType": {
11455+
"en-us": "boolean-default"
11456+
},
11457+
"Name": {
11458+
"en-us": "AutoGenerate"
11459+
},
11460+
"Notes": {
11461+
"en-us": ""
11462+
},
11463+
"Placeholder": {
11464+
"en-us": ""
11465+
},
11466+
"ValidationRegExJavaScript": {
11467+
"en-us": ""
11468+
}
11469+
},
11470+
"Entity": {
11471+
"Errors": {
11472+
"*": []
11473+
},
11474+
"Formulas": {
11475+
"*": []
11476+
},
11477+
"Warnings": {
11478+
"*": []
11479+
}
11480+
},
11481+
"Boolean": {
11482+
"Disabled": {
11483+
"en-us": false
11484+
},
11485+
"DisableTranslation": {
11486+
"en-us": false
11487+
},
11488+
"Required": {
11489+
"en-us": false
11490+
},
11491+
"VisibleInEditUI": {
11492+
"en-us": true
11493+
}
11494+
}
11495+
},
11496+
"Owner": "unknown"
11497+
},
11498+
{
11499+
"Id": 185428,
11500+
"Version": 1,
11501+
"Guid": "25e68b9c-73a5-4318-81e4-7178359cb2a7",
11502+
"Type": {
11503+
"Id": "@Boolean",
11504+
"Name": "@Boolean"
11505+
},
11506+
"Attributes": {
11507+
"String": {
11508+
"TitleFalse": {
11509+
"en-us": "Don't auto re-generate code when data changes (default)"
11510+
},
11511+
"TitleIndeterminate": {
11512+
"en-us": ""
11513+
},
11514+
"TitleTrue": {
11515+
"en-us": "Auto re-generate code when Content-Types change"
11516+
}
11517+
}
11518+
},
11519+
"Owner": "dnn:userid=41"
11520+
}
11521+
]
1134611522
}
1134711523
]
1134811524
},

‎Src/Dnn/ToSic.Sxc.Dnn.WebApi/Dnn/Backend/App/AppQueryController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public IDictionary<string, IEnumerable<EavLightEntity>> Query(
2020
[FromUri] string name,
2121
[FromUri] int? appId = null,
2222
[FromUri] string stream = null,
23-
[FromUri] bool includeGuid = false
23+
[FromUri] bool? includeGuid = false
2424
) => Real.Query(name, appId, stream, includeGuid);
2525

2626
[HttpPost]
@@ -29,7 +29,7 @@ public IDictionary<string, IEnumerable<EavLightEntity>> QueryPost
2929
[FromBody] QueryParametersDtoFromClient more,
3030
[FromUri] int? appId = null,
3131
[FromUri] string stream = null,
32-
[FromUri] bool includeGuid = false
32+
[FromUri] bool? includeGuid = false
3333
) => Real.QueryPost(name, more, appId, stream, includeGuid);
3434

3535
[HttpGet]

‎Src/Dnn/ToSic.Sxc.Dnn/DnnPackageBuilder/ReleaseNotes.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p>
2-
<b>2sxc v21.03.00</b>
2+
<b>2sxc v21.04.00</b>
33
<br><br>
44
Note: 2sxc v20 cleans up a lot of old APIs, so it's called a <a href="https://go.2sxc.org/mot">MoT release</a> (Moment of Truth).
55
<br><br>

‎Src/Dnn/ToSic.Sxc.Dnn/DnnPackageBuilder/ToSic.Sxc.Dnn.dnn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
33

4-
<package name="2sxc" type="Module" version="21.03.00">
4+
<package name="2sxc" type="Module" version="21.04.00">
55
<friendlyName> Content</friendlyName>
66
<description>2sxc is a DNN Extension to create attractive and designed content. It solves the common problem, allowing the web designer to create designed templates for different content elements, so that the user must only fill in fields and receive a perfectly designed and animated output.</description>
77
<iconFile>icon.png</iconFile>
@@ -69,7 +69,7 @@
6969
<script type="UnInstall">
7070
<path>SqlDataProvider</path>
7171
<name>Uninstall.SqlDataProvider</name>
72-
<version>21.03.00</version>
72+
<version>21.04.00</version>
7373
</script>
7474
</scripts>
7575
</component>
@@ -558,7 +558,7 @@
558558
</package>
559559

560560

561-
<package name="2sxc-app" type="Module" version="21.03.00">
561+
<package name="2sxc-app" type="Module" version="21.04.00">
562562
<friendlyName> App</friendlyName>
563563
<description>2sxc App is an extension that allows to install and use a 2sxc app.</description>
564564
<iconFile>icon-app.png</iconFile>

‎Src/Oqtane/ToSic.Sxc.Oqt.Package/ToSic.Sxc.Oqtane.Install.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>ToSic.Sxc.Oqtane.Install</id>
5-
<version>21.03.00</version>
5+
<version>21.04.00</version>
66
<authors>2sic internet solutions GmbH, Switzerland</authors>
77
<owners>2sic internet solutions GmbH, Switzerland</owners>
88
<title>2sxc CMS and Meta-Module for Oqtane</title>

‎Src/Oqtane/ToSic.Sxc.Oqt.Server/WebApi/App/AppQueryController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public IDictionary<string, IEnumerable<EavLightEntity>> Query(
4545
[FromRoute] string name,
4646
[FromQuery] int? appId = null,
4747
[FromRoute] string stream = null,
48-
[FromQuery] bool includeGuid = false
48+
[FromQuery] bool? includeGuid = false
4949
) => Real.Query(name, appId, stream, includeGuid);
5050

5151
[HttpPost($"{AppParts.Auto}/{AppParts.Query}" + "/{name}")]
@@ -55,6 +55,6 @@ public IDictionary<string, IEnumerable<EavLightEntity>> QueryPost(
5555
QueryParametersDtoFromClient more,
5656
[FromQuery] int? appId = null,
5757
[FromRoute] string stream = null,
58-
[FromQuery] bool includeGuid = false
58+
[FromQuery] bool? includeGuid = false
5959
) => Real.QueryPost(name, more, appId, stream, includeGuid);
6060
}

‎Src/Oqtane/ToSic.Sxc.Oqt.Shared/Properties/EavSharedAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static class SharedAssemblyInfo
99
// This is because the version etc. may be compiled into Oqtane DLLs
1010
// which will run in the browser, and shouldn't have to include these DLLs to work
1111
// If it's a constant, the value will be added to the compiled code, so no real dependency will exist at runtime
12-
public const string AssemblyVersion = "21.03.00";
12+
public const string AssemblyVersion = "21.04.00";
1313
public const string Company = "2sic internet solutions GmbH, Switzerland";
1414
//public const string EavProduct = "2sic 2sxc Oqtane System";
1515
//public const string EavCopyright = "Copyright MIT © 2sic 2025";

‎Src/SharedImports/Properties/SxcSharedAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace ToSic.Sxc.Sys;
2525
//[ShowApiWhenReleased(ShowApiMode.Never)]
2626
internal static class SxcSharedAssemblyInfo
2727
{
28-
public const string AssemblyVersion = "21.03.00";
28+
public const string AssemblyVersion = "21.04.00";
2929
public const string Company = "2sic internet solutions GmbH, Switzerland";
3030
public const string SxcProduct = "2sxc CMS- and Meta-Module for Dnn and Oqtane";
3131
public const string SxcCopyright = "Copyright MIT © 2sic 2025";

‎Src/Sxc/ToSic.Sxc.Adam/Adam/Sys.Manager/AdamContext.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class AdamContext(AdamContext.Dependencies services)
2626
#region Constructor and DI
2727

2828
public record Dependencies(
29-
Generator<MultiPermissionsTypes> TypesPermissions,
29+
Generator<MultiPermissionsTypes, MultiPermissionsTypes.Options> TypesPermissions,
3030
Generator<IAdamSecurityCheckService> AdamSecurityGenerator,
3131
LazySvc<ISysFeaturesService> FeaturesSvc,
3232
LazySvc<AdamManager> AdamManagerLazy,
@@ -61,9 +61,9 @@ public AdamContext Init(IContextOfApp context, string contentType, string fieldN
6161

6262
Context = context;
6363

64-
Permissions = Services.TypesPermissions.New()
65-
.Init(context, context.AppReaderRequired, contentType);
66-
64+
Permissions = Services.TypesPermissions.New(new()
65+
{ SiteContext = context, App = context.AppReaderRequired, ContentTypes = [contentType] })
66+
;
6767
// only do checks on field/guid if it's actually accessing that, if it's on the portal root, don't.
6868
UseSiteRoot = usePortalRoot;
6969
if (!usePortalRoot)

0 commit comments

Comments
 (0)