Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 0.20.3 <small>2026-05-08</small>

## 🐛 Bug Fixes
- Fix `Task/Review` not hiding nav and footer when displayed in a modal.
- Fix shared `Log` view not hiding nav/footer, not showing a Close button, and reserving excess vertical space when displayed in a modal.
- Fix README gif path after `samples` folder was relocated out of `App_Data`.

<!-- CHANGELOG_BOUNDARY -->

# 0.20.2 <small>2026-05-05</small>

## 🐛 Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ There are recipes for MSSQL, PostgreSql, and SQLite for the above tasks. Initial
Putting it all together, here is a GIF showing a report (with map) that has a bulk
action to change color associated with the record.

![bogus report](src/Site/App_Data/samples/sacramento-crime/criminal-bulk-actions.gif)
![bogus report](src/Site/samples/sacramento-crime/criminal-bulk-actions.gif)

`TODO: Link to arrangement here.`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<TargetFramework>net10.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<RootNamespace>TransformalizeModule</RootNamespace>
<Version>0.20.2</Version>
<FileVersion>0.20.2</FileVersion>
<AssemblyVersion>0.20.2</AssemblyVersion>
<Version>0.20.3</Version>
<FileVersion>0.20.3</FileVersion>
<AssemblyVersion>0.20.3</AssemblyVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Dale Newman</Authors>
<Copyright>Copyright © 2013-2026</Copyright>
Expand Down
24 changes: 22 additions & 2 deletions src/OrchardCore.Transformalize/Views/Shared/Log.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
var auth = Context.RequestServices.GetService<IAuthorizationService>();
var returnUrl = string.Empty;
var target = "_self";
var isModal = Context.Request.Query["modal"] == "1";
if (Model.Item != null) {
// You might not want to re-run your task automatically
if (Model.Item.ContentType == "TransformalizeTask") {
Expand All @@ -17,6 +18,21 @@
}
}
}

@if (isModal) {
<style>
nav {
display: none !important;
}
footer {
display: none !important;
}
div.table-responsive {
min-height: auto !important;
}
</style>
}

<style>
.table-sm > tbody > tr > td {
padding: 2px;
Expand All @@ -31,10 +47,14 @@
}
</style>

@if (Model.Item != null && await auth.AuthorizeAsync(Context.User, OrchardCore.Contents.Permissions.EditContent, Model.Item)) {
@if (!isModal && Model.Item != null && await auth.AuthorizeAsync(Context.User, OrchardCore.Contents.Permissions.EditContent, Model.Item)) {
<button title="edit this report" type="button" class="btn btn-warning btn-sm float-end" onclick="window.open('@(Url.Content("~/Admin/Contents/ContentItems/" + Model.Item.ContentItemId + "/Edit?" + Common.ReturnUrlName + "=" + returnUrl))', '@target');">
<span class="fas fa-edit"></span>
</button>
}

@Html.Partial("LogDetail", Model)
@Html.Partial("LogDetail", Model)

@if (isModal) {
<a href="javascript:void()" class="btn btn-secondary active" role="button" aria-pressed="true" onclick="window.parent.postMessage({ action: 'closeModal', reason: 'confirmed' }, '*');">Close</a>
}
11 changes: 11 additions & 0 deletions src/OrchardCore.Transformalize/Views/Task/Review.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
var isModal = Context.Request.Query["modal"] == "1";
}

@if (isModal) {
<style>
nav {
display: none !important;
}
footer {
display: none !important;
}
</style>
}

<script asp-name="jQuery" at="Head"></script>
<script asp-name="jQuery-ui" at="Head"></script>
<script asp-name="block-ui" version="2.70.0" at="Foot"></script>
Expand Down
8 changes: 4 additions & 4 deletions src/Site/Site.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
<DockerfileTag>transformalize.orchard</DockerfileTag>
<Version>0.20.2</Version>
<FileVersion>0.20.2</FileVersion>
<AssemblyVersion>0.20.2</AssemblyVersion>
<ReleaseVersion>0.20.2</ReleaseVersion>
<Version>0.20.3</Version>
<FileVersion>0.20.3</FileVersion>
<AssemblyVersion>0.20.3</AssemblyVersion>
<ReleaseVersion>0.20.3</ReleaseVersion>
<RazorRuntimeCompilation>true</RazorRuntimeCompilation>
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
<Nullable>enable</Nullable>
Expand Down
Loading