diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java index c8acbff9dc..5fe790f3ed 100644 --- a/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java +++ b/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java @@ -59,9 +59,12 @@ public class CheckListTemplateDataPanel extends Panel { }; add(numberDropDown); - IColumn[] columns = new IColumn[2]; + IColumn[] columns = new IColumn[4]; columns[0] = new PropertyColumn<CheckListTemplate>(Model.of("Name"), "name", "name"); - columns[1] = new PropertyColumn<CheckListTemplate>(Model.of("Creator"), "creator"); + columns[1] = new PropertyColumn<CheckListTemplate>(Model.of("Creator"), "creator", "creator"); + columns[2] = new PropertyColumn<CheckListTemplate>(Model.of("Categories"), "categories", "categories"); + columns[3] = new PropertyColumn<CheckListTemplate>(Model.of("Created"), "dateCreated", "dateCreated"); + table = new DataTable<CheckListTemplate>("datatable", columns, checklistTemplateProvider = new ChecklistTemplateProvider(), 10); table.setOutputMarkupId(true); diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/ChecklistCategory.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/ChecklistCategory.java index 2256449158..be55dd8ce9 100644 --- a/src/main/java/se/su/dsv/scipro/data/dataobjects/ChecklistCategory.java +++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/ChecklistCategory.java @@ -83,6 +83,10 @@ public class ChecklistCategory extends DomainObject{ return false; return true; } - + + @Override + public String toString(){ + return categoryName; + } }