Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add html-prefix parameters to the IDisplayManager #11775

Merged
merged 22 commits into from
Aug 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
998d170
Merge pull request #1 from OrchardCMS/main
MikeAlhayek Nov 13, 2021
70b66d3
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Dec 1, 2021
d1c31d2
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Dec 23, 2021
d277228
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Dec 28, 2021
718b31f
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 4, 2022
40b4803
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 5, 2022
25ea712
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 16, 2022
bd905ca
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 20, 2022
295b392
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Feb 23, 2022
7ac581c
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Apr 20, 2022
e4d5a2b
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Apr 22, 2022
0d02eb3
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Apr 27, 2022
4df6578
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 1, 2022
d46460c
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 10, 2022
606d821
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 10, 2022
028be3b
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 13, 2022
bcc0090
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 13, 2022
18a6f0b
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 16, 2022
d2b173a
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 18, 2022
18a4769
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 21, 2022
fac1a93
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 24, 2022
7ff0f93
Adds the prefix to the display manager. Fixes #11612
malhayek2014 May 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ public Task<IShape> BuildDisplayAsync(IActivity model, IUpdateModel updater, str
return _displayManager.BuildDisplayAsync(model, updater, displayType, groupId);
}

public Task<IShape> BuildEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "")
public Task<IShape> BuildEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "")
{
return _displayManager.BuildEditorAsync(model, updater, isNew, groupId);
return _displayManager.BuildEditorAsync(model, updater, isNew, groupId, htmlPrefix);
}

public Task<IShape> UpdateEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "")
public Task<IShape> UpdateEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "")
{
return _displayManager.UpdateEditorAsync(model, updater, isNew, groupId);
return _displayManager.UpdateEditorAsync(model, updater, isNew, groupId, htmlPrefix);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ await _drivers.InvokeAsync(async (driver, model, context) =>
return shape;
}

public async Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group = null)
public async Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group = null, string htmlPrefix = "")
{
var actualShapeType = typeof(TModel).Name + "_Edit";

Expand All @@ -84,7 +84,7 @@ public async Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, b
shape,
group ?? "",
isNew,
"",
htmlPrefix,
_shapeFactory,
await _layoutAccessor.GetLayoutAsync(),
new ModelStateWrapperUpdater(updater)
Expand All @@ -104,7 +104,7 @@ await _drivers.InvokeAsync(async (driver, model, context) =>
return shape;
}

public async Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group = null)
public async Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group = null, string htmlPrefix = "")
{
var actualShapeType = typeof(TModel).Name + "_Edit";

Expand All @@ -118,7 +118,7 @@ public async Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater,
shape,
group ?? "",
isNew,
"",
htmlPrefix,
_shapeFactory,
await _layoutAccessor.GetLayoutAsync(),
new ModelStateWrapperUpdater(updater)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace OrchardCore.DisplayManagement
public interface IDisplayManager<TModel>
{
Task<IShape> BuildDisplayAsync(TModel model, IUpdateModel updater, string displayType = "", string groupId = "");
Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "");
Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "");
Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "");
Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "");
}
}