Skip to content

CAUSEWAY-3891: backports fix from main #3247

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.

Sign up for GitHub

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

Open
danhaywood wants to merge 2 commits into
base: maintenance-branch
Choose a base branch
from
Open

CAUSEWAY-3891: backports fix from main #3247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
538c8c9
CAUSEWAY-3891: backports fix from main
danhaywood Nov 19, 2025
ed1b7f7
CAUSEWAY-3945 : backports remove cache for table downloads also
danhaywood Nov 19, 2025
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
13 changes: 8 additions & 5 deletions ...rc/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,20 @@ protected MarkupContainer createRegularFrame() {
return createShallowRegularFrame();
}

val scalarModel = scalarModel();
val attributeModel = scalarModel();

val regularFrame = new WebMarkupContainer(ID_SCALAR_IF_REGULAR);

var documentUrl = urlFor(
new ListenerRequestHandler(
new PageAndComponentProvider(getPage(), this)))
// adds a hash to the URL, such that browser caching works as desired
+ "&md5=" + blob.md5Hex();
val pdfJsConfig =
scalarModel.getMetaModel().lookupFacet(PdfJsViewerFacet.class)
attributeModel.getMetaModel().lookupFacet(PdfJsViewerFacet.class)
.map(pdfJsViewerFacet->pdfJsViewerFacet.configFor(buildKey()))
.orElseGet(PdfJsConfig::new)
.withDocumentUrl(urlFor(
new ListenerRequestHandler(
new PageAndComponentProvider(getPage(), this))));
.withDocumentUrl(documentUrl);

val pdfJsPanel = new PdfJsPanel(ID_SCALAR_VALUE, pdfJsConfig);

Expand Down
2 changes: 2 additions & 0 deletions viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import java.io.File;
import java.io.Serializable;
import java.time.Duration;
import java.util.List;
import java.util.Optional;
import java.util.OptionalInt;
Expand Down Expand Up @@ -651,6 +652,7 @@ public void fileDownloadClickHandler(final IModel<File> model, final CommonMimeT
RequestCycle.get().scheduleRequestHandlerAfterCurrent(
Wkt.fileResourceStreamRequestHandler(file, mime)
.setFileName(fileName)
.setCacheDuration(Duration.ZERO)
.setContentDisposition(ContentDisposition.ATTACHMENT));
}

Expand Down