diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java index 9398e28e5b..00ccdcbf3d 100644 --- a/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java +++ b/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java @@ -2,6 +2,9 @@ package se.su.dsv.scipro.admin.pages; import org.apache.wicket.PageParameters; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.model.IModel; +import se.su.dsv.scipro.data.dataobjects.CheckListTemplate; import se.su.dsv.scipro.datatables.checklist.CheckListTemplateDataPanel; import se.su.dsv.scipro.security.auth.Authorization; import se.su.dsv.scipro.security.auth.roles.Roles; @@ -21,7 +24,12 @@ public class AdminCheckListPage extends AbstractAdminPage { super(pp); // add(new AdminListCheckListTemplatePanel("listCLPanel", pp, CheckListRole.ADMIN)); - add(new CheckListTemplateDataPanel("datapanel")); + add(new CheckListTemplateDataPanel("datapanel") { + @Override + public void onClick(IModel<CheckListTemplate> clicked, AjaxRequestTarget target) { + System.out.println(clicked.getObject().getCreator()); + } + }); } diff --git a/src/main/java/se/su/dsv/scipro/datatables/checklist/CheckListTemplateDataPanel.java b/src/main/java/se/su/dsv/scipro/datatables/checklist/CheckListTemplateDataPanel.java index 16e4ec7f85..f6fb8754e8 100644 --- a/src/main/java/se/su/dsv/scipro/datatables/checklist/CheckListTemplateDataPanel.java +++ b/src/main/java/se/su/dsv/scipro/datatables/checklist/CheckListTemplateDataPanel.java @@ -22,11 +22,13 @@ import java.util.Iterator; * Author: fred-fri * Date: 5/2/12 */ -public class CheckListTemplateDataPanel extends Panel { +public abstract class CheckListTemplateDataPanel extends Panel { @SpringBean public ChecklistTemplateService checklistTemplateService; + CheckListTemplateDataPanel cltdp; //must be kept as a reference to self for abstract method cascading + DataTable<CheckListTemplate> table; NavigationToolbar navigationToolbar; FilterStringPanel filterStringPanel; @@ -34,9 +36,13 @@ public class CheckListTemplateDataPanel extends Panel { AjaxDropDown<Integer> numberDropDown; ChecklistTemplateProvider checklistTemplateProvider; + public abstract void onClick(IModel<CheckListTemplate> clicked, AjaxRequestTarget target); + public CheckListTemplateDataPanel(String id) { super(id); + cltdp = this; + filterStringPanel = new FilterStringPanel("filterStringPanel") { @Override public void onUpdateFilter(AjaxRequestTarget target) { @@ -66,7 +72,8 @@ public class CheckListTemplateDataPanel extends Panel { columns[0] = new ClickableTitleColumn<CheckListTemplate>(Model.of("Name"), "name", "name") { @Override protected void onClick(IModel<CheckListTemplate> clicked, AjaxRequestTarget target) { - System.out.println(clicked.getObject().getName()); +// System.out.println(clicked.getObject().getName()); + cltdp.onClick(clicked, target); } }; columns[1] = new PropertyColumn<CheckListTemplate>(Model.of("Creator"), "creator", "creator");