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

Merge OpenOLAT 10.4 to OpenOLATpro 10.4 with 19481bbdea320155204d9753de71359f3348513e

parents 3ced26a7 a4495366
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,7 @@ import java.util.List; ...@@ -24,6 +24,7 @@ import java.util.List;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component; import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.EscapeMode;
import org.olat.core.gui.components.link.Link; import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.components.link.LinkFactory; import org.olat.core.gui.components.link.LinkFactory;
import org.olat.core.gui.components.panel.StackedPanel; import org.olat.core.gui.components.panel.StackedPanel;
...@@ -86,7 +87,9 @@ public class CourseAreasController extends MainLayoutBasicController { ...@@ -86,7 +87,9 @@ public class CourseAreasController extends MainLayoutBasicController {
listenTo(tableCtrl); listenTo(tableCtrl);
tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("table.header.name", 0, null, getLocale())); tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("table.header.name", 0, null, getLocale()));
tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("table.header.description", 1, null, getLocale())); DefaultColumnDescriptor descriptionColDesc = new DefaultColumnDescriptor("table.header.description", 1, null, getLocale());
descriptionColDesc.setEscapeHtml(EscapeMode.antisamy);
tableCtrl.addColumnDescriptor(descriptionColDesc);
tableCtrl.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_EDIT, "action", translate("edit"))); tableCtrl.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_EDIT, "action", translate("edit")));
tableCtrl.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_DELETE, "action", translate("delete"))); tableCtrl.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_DELETE, "action", translate("delete")));
......
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