Skip to content
Snippets Groups Projects
Commit ef584d0f authored by srosse's avatar srosse
Browse files

OO-4878: edit document in new window in briefcase component

parent 9d72f8fe
No related branches found
No related tags found
No related merge requests found
...@@ -275,7 +275,7 @@ public class ListRenderer { ...@@ -275,7 +275,7 @@ public class ListRenderer {
if(xssErrors) { if(xssErrors) {
sb.append("<i class='o_icon o_icon-fw o_icon_banned'> </i> "); sb.append("<i class='o_icon o_icon-fw o_icon_banned'> </i> ");
sb.append(StringHelper.escapeHtml(name)); sb.append(StringHelper.escapeHtml(name));
log.error("XSS Scan found something suspicious in: " + child); log.error("XSS Scan found something suspicious in: {}", child);
} else { } else {
sb.append("<a id='o_sel_doc_").append(pos).append("'"); sb.append("<a id='o_sel_doc_").append(pos).append("'");
...@@ -361,7 +361,6 @@ public class ListRenderer { ...@@ -361,7 +361,6 @@ public class ListRenderer {
if (hasMeta) { if (hasMeta) {
// render tooltip only when it contains something // render tooltip only when it contains something
sb.append("<script>") sb.append("<script>")
.append("/* <![CDATA[ */")
.append("jQuery(function() {\n") .append("jQuery(function() {\n")
.append(" jQuery('#o_sel_doc_").append(pos).append("').tooltip({\n") .append(" jQuery('#o_sel_doc_").append(pos).append("').tooltip({\n")
.append(" html: true,\n") .append(" html: true,\n")
...@@ -372,7 +371,6 @@ public class ListRenderer { ...@@ -372,7 +371,6 @@ public class ListRenderer {
.append(" jQuery('#o_sel_doc_").append(pos).append("').tooltip('hide');\n") .append(" jQuery('#o_sel_doc_").append(pos).append("').tooltip('hide');\n")
.append(" });\n") .append(" });\n")
.append("});") .append("});")
.append("/* ]]> */")
.append("</script>"); .append("</script>");
} }
} }
...@@ -412,7 +410,7 @@ public class ListRenderer { ...@@ -412,7 +410,7 @@ public class ListRenderer {
} }
if(canContainerVersion) { if(canContainerVersion) {
if (canVersion && revisionNr > 1) { if (metadata != null && canVersion && revisionNr > 1) {
sb.append("<span class='text-muted small'>") sb.append("<span class='text-muted small'>")
.append(metadata.getRevisionNr()) .append(metadata.getRevisionNr())
.append("</span>"); .append("</span>");
...@@ -453,7 +451,7 @@ public class ListRenderer { ...@@ -453,7 +451,7 @@ public class ListRenderer {
if (openIcon != null) { if (openIcon != null) {
sb.append("<a "); sb.append("<a ");
ubu.buildHrefAndOnclick(sb, null, iframePostEnabled, false, false, ubu.buildHrefAndOnclick(sb, null, iframePostEnabled, false, false,
new NameValuePair(PARAM_CONTENT_EDIT_ID, pos)); new NameValuePair(PARAM_CONTENT_EDIT_ID, pos), new NameValuePair("oo-opennewwindow-oo", "true"));
sb.append(" title=\"").append(StringHelper.escapeHtml(translator.translate("mf.open"))); sb.append(" title=\"").append(StringHelper.escapeHtml(translator.translate("mf.open")));
sb.append("\"><i class=\"o_icon o_icon-fw ").append(openIcon).append("\"></i></a>"); sb.append("\"><i class=\"o_icon o_icon-fw ").append(openIcon).append("\"></i></a>");
} }
...@@ -500,11 +498,9 @@ public class ListRenderer { ...@@ -500,11 +498,9 @@ public class ListRenderer {
sb.append("</ul></div>") sb.append("</ul></div>")
.append("<script>") .append("<script>")
.append("/* <![CDATA[ */")
.append("jQuery(function() {\n") .append("jQuery(function() {\n")
.append(" o_popover('o_sel_actions_").append(pos).append("','o_sel_actions_pop_").append(pos).append("','left');\n") .append(" o_popover('o_sel_actions_").append(pos).append("','o_sel_actions_pop_").append(pos).append("','left');\n")
.append("});") .append("});")
.append("/* ]]> */")
.append("</script>"); .append("</script>");
} }
} }
......
...@@ -29,7 +29,6 @@ import org.junit.Test; ...@@ -29,7 +29,6 @@ import org.junit.Test;
import org.olat.core.commons.services.doceditor.discovery.Action; import org.olat.core.commons.services.doceditor.discovery.Action;
import org.olat.core.commons.services.doceditor.discovery.App; import org.olat.core.commons.services.doceditor.discovery.App;
import org.olat.core.commons.services.doceditor.discovery.NetZone; import org.olat.core.commons.services.doceditor.discovery.NetZone;
import org.olat.core.commons.services.doceditor.discovery.manager.DiscoveryServiceImpl;
import org.olat.core.commons.services.doceditor.discovery.model.ActionImpl; import org.olat.core.commons.services.doceditor.discovery.model.ActionImpl;
import org.olat.core.commons.services.doceditor.discovery.model.AppImpl; import org.olat.core.commons.services.doceditor.discovery.model.AppImpl;
import org.olat.core.commons.services.doceditor.discovery.model.DiscoveryImpl; import org.olat.core.commons.services.doceditor.discovery.model.DiscoveryImpl;
......
...@@ -31,7 +31,6 @@ import org.olat.core.commons.services.doceditor.discovery.App; ...@@ -31,7 +31,6 @@ import org.olat.core.commons.services.doceditor.discovery.App;
import org.olat.core.commons.services.doceditor.discovery.Discovery; import org.olat.core.commons.services.doceditor.discovery.Discovery;
import org.olat.core.commons.services.doceditor.discovery.NetZone; import org.olat.core.commons.services.doceditor.discovery.NetZone;
import org.olat.core.commons.services.doceditor.discovery.ProofKey; import org.olat.core.commons.services.doceditor.discovery.ProofKey;
import org.olat.core.commons.services.doceditor.discovery.manager.DiscoveryXStream;
/** /**
* *
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment