gCubeSystem
/
vlabs-display-portlet
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bugs

This commit is contained in:
Massimiliano Assante 2023-03-08 17:45:38 +01:00
parent ac1642e90b
commit 092cd97743
2 changed files with 67 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/main/java/org/gcube/portlets/user/vlabs/VLabsDisplayConfigurationAction.java
View File

@ -19,40 +19,64 @@ public class VLabsDisplayConfigurationAction extends DefaultConfigurationAction
String icondocURL = prefs.getValue("icondocURL", "0");
_log.info("icondocURL = " + icondocURL + " in ConfigurationAction.processAction() saved correctly");
String exploratoryName1Title = prefs.getValue("exploratoryName1-Title", "");
_log.info("exploratoryName1-Title = " + exploratoryName1Title + " in ConfigurationAction.processAction() saved correctly");
String exploratoryName2Title = prefs.getValue("exploratoryName2-Title", "");
_log.info("exploratoryName2-Title = " + exploratoryName2Title + " in ConfigurationAction.processAction() saved correctly");
String exploratoryName3Title = prefs.getValue("exploratoryName3-Title", "");
_log.info("exploratoryName3-Title = " + exploratoryName3Title + " in ConfigurationAction.processAction() saved correctly");
String exploratoryName4Title = prefs.getValue("exploratoryName4-Title", "");
_log.info("exploratoryName4-Title = " + exploratoryName4Title + " in ConfigurationAction.processAction() saved correctly");
String exploratoryName5Title = prefs.getValue("exploratoryName5-Title", "");
_log.info("exploratoryName5-Title = " + exploratoryName5Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName1Title = prefs.getValue("vlabName1-Title", "");
_log.info("vlabName1-Title = " + vlabName1Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName2Title = prefs.getValue("vlabName2-Title", "");
_log.info("vlabName2-Title = " + vlabName2Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName3Title = prefs.getValue("vlabName3-Title", "");
_log.info("vlabName3-Title = " + vlabName3Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName4Title = prefs.getValue("vlabName4-Title", "");
_log.info("vlabName4-Title = " + vlabName4Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName5Title = prefs.getValue("vlabName5-Title", "");
_log.info("vlabName5-Title = " + vlabName5Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName6Title = prefs.getValue("vlabName6-Title", "");
_log.info("vlabName6-Title = " + vlabName6Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName7Title = prefs.getValue("vlabName7-Title", "");
_log.info("vlabName7-Title = " + vlabName7Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName8Title = prefs.getValue("vlabName8-Title", "");
_log.info("vlabName8-Title = " + vlabName8Title + " in ConfigurationAction.processAction() saved correctly");
String vlabName9Title = prefs.getValue("vlabName9-Title", "");
_log.info("vlabName9-Title = " + vlabName9Title + " in ConfigurationAction.processAction() saved correctly");
long exploratoryName1DocumentId = Long.parseLong(prefs.getValue("exploratoryName1-DocumentId", "0"));
_log.info("exploratoryName1-DocumentId = " + exploratoryName1DocumentId + " in ConfigurationAction.processAction() saved correctly");
long exploratoryName2DocumentId = Long.parseLong(prefs.getValue("exploratoryName2-DocumentId", "0"));
_log.info("exploratoryName2-DocumentId = " + exploratoryName2DocumentId + " in ConfigurationAction.processAction() saved correctly");
long exploratoryName3DocumentId = Long.parseLong(prefs.getValue("exploratoryName3-DocumentId", "0"));
_log.info("exploratoryName3-DocumentId = " + exploratoryName3DocumentId + " in ConfigurationAction.processAction() saved correctly");
long exploratoryName4DocumentId = Long.parseLong(prefs.getValue("exploratoryName4-DocumentId", "0"));
_log.info("exploratoryName4-DocumentId = " + exploratoryName4DocumentId + " in ConfigurationAction.processAction() saved correctly");
long exploratoryName5DocumentId = Long.parseLong(prefs.getValue("exploratoryName5-DocumentId", "0"));
_log.info("exploratoryName4-DocumentId = " + exploratoryName5DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName1DocumentId = Long.parseLong(prefs.getValue("vlabName1-DocumentId", "0"));
_log.info("vlabName1-DocumentId = " + vlabName1DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName2DocumentId = Long.parseLong(prefs.getValue("vlabName2-DocumentId", "0"));
_log.info("vlabName2-DocumentId = " + vlabName2DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName3DocumentId = Long.parseLong(prefs.getValue("vlabName3-DocumentId", "0"));
_log.info("vlabName3-DocumentId = " + vlabName3DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName4DocumentId = Long.parseLong(prefs.getValue("vlabName4-DocumentId", "0"));
_log.info("vlabName4-DocumentId = " + vlabName4DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName5DocumentId = Long.parseLong(prefs.getValue("vlabName5-DocumentId", "0"));
_log.info("vlabName5-DocumentId = " + vlabName5DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName6DocumentId = Long.parseLong(prefs.getValue("vlabName6-DocumentId", "0"));
_log.info("vlabName6-DocumentId = " + vlabName6DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName7DocumentId = Long.parseLong(prefs.getValue("vlabName7-DocumentId", "0"));
_log.info("vlabName7-DocumentId = " + vlabName7DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName8DocumentId = Long.parseLong(prefs.getValue("vlabName8-DocumentId", "0"));
_log.info("vlabName8-DocumentId = " + vlabName8DocumentId + " in ConfigurationAction.processAction() saved correctly");
long vlabName9DocumentId = Long.parseLong(prefs.getValue("vlabName9-DocumentId", "0"));
_log.info("vlabName9-DocumentId = " + vlabName9DocumentId + " in ConfigurationAction.processAction() saved correctly");
String exploratory1Url = prefs.getValue("exploratory1-Url", "");
_log.info("exploratory1-Url = " + exploratory1Url + " in ConfigurationAction.processAction() saved correctly");
String exploratory2Url = prefs.getValue("exploratory2-Url", "");
_log.info("exploratory2-Url = " + exploratory2Url + " in ConfigurationAction.processAction() saved correctly");
String exploratory3Url = prefs.getValue("exploratory3-Url", "");
_log.info("exploratory3-Url = " + exploratory3Url + " in ConfigurationAction.processAction() saved correctly");
String exploratory4Url = prefs.getValue("exploratory4-Url", "");
_log.info("exploratory4-Url = " + exploratory4Url + " in ConfigurationAction.processAction() saved correctly");
String exploratory5Url = prefs.getValue("exploratory5-Url", "");
_log.info("exploratory5-Url = " + exploratory5Url + " in ConfigurationAction.processAction() saved correctly");
String vlab1Url = prefs.getValue("vlab1-Url", "");
_log.info("vlab1-Url = " + vlab1Url + " in ConfigurationAction.processAction() saved correctly");
String vlab2Url = prefs.getValue("vlab2-Url", "");
_log.info("vlab2-Url = " + vlab2Url + " in ConfigurationAction.processAction() saved correctly");
String vlab3Url = prefs.getValue("vlab3-Url", "");
_log.info("vlab3-Url = " + vlab3Url + " in ConfigurationAction.processAction() saved correctly");
String vlab4Url = prefs.getValue("vlab4-Url", "");
_log.info("vlab4-Url = " + vlab4Url + " in ConfigurationAction.processAction() saved correctly");
String vlab5Url = prefs.getValue("vlab5-Url", "");
_log.info("vlab5-Url = " + vlab5Url + " in ConfigurationAction.processAction() saved correctly");
String vlab6Url = prefs.getValue("vlab6-Url", "");
_log.info("vlab6-Url = " + vlab6Url + " in ConfigurationAction.processAction() saved correctly");
String vlab7Url = prefs.getValue("vlab7-Url", "");
_log.info("vlab7-Url = " + vlab7Url + " in ConfigurationAction.processAction() saved correctly");
String vlab8Url = prefs.getValue("vlab8-Url", "");
_log.info("vlab8-Url = " + vlab8Url + " in ConfigurationAction.processAction() saved correctly");
String vlab9Url = prefs.getValue("vlab9-Url", "");
_log.info("vlab9-Url = " + vlab9Url + " in ConfigurationAction.processAction() saved correctly");
}

22
src/main/webapp/html/vlabsdisplay/view.jsp
View File

@ -30,7 +30,7 @@
pageContext.setAttribute("vlabName9Title",
GetterUtil.getString(portletPreferences.getValue("vlabName9-Title", StringPool.BLANK)));
long vlabName1DocumentId = GetterUtil.getLong(portletPreferences.getValue("vlabName1-DocumentId", StringPool.BLANK));
long vlabName2DocumentId = GetterUtil.getLong(portletPreferences.getValue("vlabName2-DocumentId", StringPool.BLANK));
long vlabName3DocumentId = GetterUtil.getLong(portletPreferences.getValue("vlabName3-DocumentId", StringPool.BLANK));
@ -122,6 +122,7 @@
Node node = document.selectSingleNode("/root/static-content");
content3 = node.getText();
}
String content4 = "";
if (vlabName4DocumentId > 0) {
JournalArticle article = JournalArticleLocalServiceUtil.getArticle(groupId,
@ -130,13 +131,14 @@
Node node = document.selectSingleNode("/root/static-content");
content4 = node.getText();
}
String content5 = "";
if (vlabName5DocumentId > 0) {
JournalArticle article = JournalArticleLocalServiceUtil.getArticle(groupId,
"" + vlabName5DocumentId);
Document document = SAXReaderUtil.read(article.getContent());
Node node = document.selectSingleNode("/root/static-content");
content4 = node.getText();
content5 = node.getText();
}
String content6 = "";
if (vlabName6DocumentId > 0) {
@ -144,15 +146,15 @@
"" + vlabName6DocumentId);
Document document = SAXReaderUtil.read(article.getContent());
Node node = document.selectSingleNode("/root/static-content");
content4 = node.getText();
content6 = node.getText();
}
String content7 = "";
if (vlabName4DocumentId > 0) {
if (vlabName7DocumentId > 0) {
JournalArticle article = JournalArticleLocalServiceUtil.getArticle(groupId,
"" + vlabName7DocumentId);
Document document = SAXReaderUtil.read(article.getContent());
Node node = document.selectSingleNode("/root/static-content");
content4 = node.getText();
content7 = node.getText();
}
String content8 = "";
if (vlabName8DocumentId > 0) {
@ -160,7 +162,7 @@
"" + vlabName8DocumentId);
Document document = SAXReaderUtil.read(article.getContent());
Node node = document.selectSingleNode("/root/static-content");
content4 = node.getText();
content8 = node.getText();
}
String content9 = "";
if (vlabName9DocumentId > 0) {
@ -168,7 +170,7 @@
"" + vlabName9DocumentId);
Document document = SAXReaderUtil.read(article.getContent());
Node node = document.selectSingleNode("/root/static-content");
content4 = node.getText();
content9 = node.getText();
}
%>
<c:if test="${not empty vlabName1Title}">
@ -266,8 +268,10 @@
<div class="asset-abstract">
<h3 class="asset-title">
<a href="${vlab4Url}"><img alt="" src="${icondocURL}">
${vlabName4Title}</a>
</h3>
${vlabName4Title}</a><span
class="access-policy ${ap4}-color"><img
src="<%=renderRequest.getContextPath()%>/images/${ap4}.png" />&nbsp;&nbsp;${ap4}</span>
</h3>
<div class="asset-content">
<div class="asset-summary" style="margin-left: 25px;">
<span id="asset-app-summarypre4"> <%