LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Some bugfixes

Jens Pelzetter 2020-08-28 20:37:09 +02:00
parent 680e708e37
commit 7c22396e28
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ccm-core/src/main/java/org/libreccm/ui/admin/AdminUi.java
View File

@ -42,6 +42,7 @@ import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.json.Json; import javax.json.Json;
import javax.json.JsonObjectBuilder; import javax.json.JsonObjectBuilder;
import javax.json.JsonWriter;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.NotFoundException; import javax.ws.rs.NotFoundException;
@ -163,15 +164,15 @@ public class AdminUi {
final Map<String, Object> data = new HashMap<>(); final Map<String, Object> data = new HashMap<>();
data.put("adminUiApps", adminUiApps.getAdminUiApps()); data.put("adminUiApps", adminUiApps.getAdminUiApps());
data.put( final StringWriter jsonStrWriter = new StringWriter();
"adminUiAppsJson", final JsonWriter jsonWriter = Json.createWriter(jsonStrWriter);
adminUiApps jsonWriter.writeArray(adminUiApps
.getAdminUiApps() .getAdminUiApps()
.stream() .stream()
.map(AdminUiApp::buildJson) .map(AdminUiApp::buildJson)
.map(JsonObjectBuilder::build) .map(JsonObjectBuilder::build)
.collect(new JsonArrayCollector()) .collect(new JsonArrayCollector()));
); data.put("adminUiAppsJson", jsonStrWriter.toString());
data.put("activeApp", app); data.put("activeApp", app);
data.put("currentUser", shiro.getUser().get()); data.put("currentUser", shiro.getUser().get());
data.put("contextPath", servletContext.getContextPath()); data.put("contextPath", servletContext.getContextPath());

4
ccm-core/src/main/java/org/libreccm/ui/admin/AdminUiApp.java
View File

@ -109,8 +109,8 @@ public interface AdminUiApp {
"cssFilesurls", "cssFilesurls",
Json.createArrayBuilder(Arrays.asList(getCssFilesUrls())) Json.createArrayBuilder(Arrays.asList(getCssFilesUrls()))
) )
.add("iconName", getIconName().orElse(null)) .add("iconName", getIconName().orElse(""))
.add("symbolUrl", getSymbolUrl().orElse(null)); .add("symbolUrl", getSymbolUrl().orElse(""));
} }
default JsonObject toJson() { default JsonObject toJson() {