Bert Leunis pushed to branch bugfix/CMS-10452 at cms-community / hippo-cms
Commits: 5baff2a6 by Bert Leunis at 2016-11-11T11:59:26+01:00 CMS-10452 revert changes in VGAL class; fix creation of double "Groups" breadcrumb - - - - - 2 changed files: - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupActionLink.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java Changes: ===================================== perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupActionLink.java ===================================== --- a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupActionLink.java +++ b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupActionLink.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 Hippo B.V. (http://www.onehippo.com) + * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package org.hippoecm.frontend.plugins.cms.admin.groups; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel; -import org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant; import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel; import org.apache.wicket.extensions.breadcrumb.panel.IBreadCrumbPanelFactory; import org.apache.wicket.markup.html.basic.Label; @@ -47,10 +46,6 @@ public class ViewGroupActionLink extends AjaxLink<String> { @Override public void onClick(AjaxRequestTarget target) { - final IBreadCrumbParticipant activeBreadCrumb = breadCrumbPanel.getBreadCrumbModel().getActive(); - if(activeBreadCrumb != null && activeBreadCrumb.getComponent().hasFeedbackMessage()) { - activeBreadCrumb.getComponent().getFeedbackMessages().clear(); - } breadCrumbPanel.activate(new IBreadCrumbPanelFactory() { public BreadCrumbPanel create(String componentId, IBreadCrumbModel breadCrumbModel) { return new ViewGroupPanel(componentId, context, breadCrumbModel, group); ===================================== perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java ===================================== --- a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java +++ b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java @@ -137,16 +137,9 @@ public class ViewGroupPanel extends AdminBreadCrumbPanel { try { group.delete(); final String infoMsg = getString("group-removed", Model.of(group)); - activateParent(); - - activate(new IBreadCrumbPanelFactory() { - public BreadCrumbPanel create(final String componentId, - final IBreadCrumbModel breadCrumbModel) { - final ListGroupsPanel groupsPanel = new ListGroupsPanel(componentId, context, breadCrumbModel, new GroupDataProvider()); - groupsPanel.info(infoMsg); - return groupsPanel; - } - }); + final IBreadCrumbParticipant activateParent = activateParent(); + activateParent.getComponent().info(infoMsg); + } catch (RepositoryException e) { error(getString("group-remove-failed", Model.of(group))); AjaxRequestTarget target = getRequestCycle().find(AjaxRequestTarget.class); View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/5baff2a61e43dc859dc068620b4e3a5a96943f91
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
