Skip to content

Fix some faces errors in admin console #1709

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

Merged
merged 3 commits into from
Jun 7, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -378,21 +378,23 @@ public String getTitle() throws ClassNotFoundException {
return fileName;
}

Workspace workspace = OGCFrontController.getServiceWorkspace().getNewWorkspace();
Class<?> cls = workspace.getModuleClassLoader().loadClass(resourceProviderClass);
ResourceMetadata<?> md = workspace.getResourceMetadata((Class) cls, id);

if (md == null) {
// lookup path if file will be created from template
ResourceManager<?> mgr = lookupResourceManager(workspace, cls);
if (mgr != null) {
return mgr.getMetadata().getWorkspacePath() + "/" + id;
if (resourceProviderClass != null) {
Workspace workspace = OGCFrontController.getServiceWorkspace().getNewWorkspace();
Class<?> cls = workspace.getModuleClassLoader().loadClass(resourceProviderClass);
ResourceMetadata<?> md = workspace.getResourceMetadata((Class) cls, id);

if (md == null) {
// lookup path if file will be created from template
ResourceManager<?> mgr = lookupResourceManager(workspace, cls);
if (mgr != null) {
return mgr.getMetadata().getWorkspacePath() + "/" + id;
}
}
}
else {
for (ResourceManager<? extends Resource> resourceManager : workspace.getResourceManagers()) {
if (resourceManager.getProviders().contains(md.getProvider())) {
return resourceManager.getMetadata().getWorkspacePath() + "/" + id;
else {
for (ResourceManager<? extends Resource> resourceManager : workspace.getResourceManagers()) {
if (resourceManager.getProviders().contains(md.getProvider())) {
return resourceManager.getMetadata().getWorkspacePath() + "/" + id;
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<!-- end -->

<error-page>
<exception-type>javax.faces.application.ViewExpiredException</exception-type>
<exception-type>jakarta.faces.application.ViewExpiredException</exception-type>
<location>/index.jsf</location>
</error-page>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<h:outputStylesheet name="buttons.css" />
<ui:insert name="additionCssInHeader" />
<h:outputScript library="js" name="console.js" />
<h:outputScript library="primefaces" name="jquery/jquery.js" />
</h:head>
<h:body>
<div id="PLEASEWAIT">
Expand Down