Repository: syncope Updated Branches: refs/heads/master 03cb2f012 -> 2748d00bb
[SYNCOPE-1101] fix css and id of the div containing actions to handle custom events Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2748d00b Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2748d00b Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2748d00b Branch: refs/heads/master Commit: 2748d00bb3150b4fffdd0a85e081b7d39e3b1978 Parents: 03cb2f0 Author: fmartelli <fabio.marte...@gmail.com> Authored: Thu Jun 1 11:52:42 2017 +0200 Committer: fmartelli <fabio.marte...@gmail.com> Committed: Thu Jun 1 11:53:24 2017 +0200 ---------------------------------------------------------------------- .../console/events/EventCategoryPanel.java | 32 ++------------------ .../console/events/EventCategoryPanel.html | 2 +- 2 files changed, 4 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/2748d00b/client/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java index 5579d29..0661456 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java @@ -202,33 +202,6 @@ public abstract class EventCategoryPanel extends Panel { @Override public void onClick(final AjaxRequestTarget target, final EventCategoryTO ignore) { if (StringUtils.isNotBlank(custom.getModelObject())) { - Map.Entry<EventCategoryTO, AuditElements.Result> parsed = AuditLoggerName.parseEventCategory(custom. - getModelObject()); - - String eventString = AuditLoggerName.buildEvent( - parsed.getKey().getType(), - null, - null, - parsed.getKey().getEvents().isEmpty() - ? StringUtils.EMPTY : parsed.getKey().getEvents().iterator().next(), - parsed.getValue()); - - custom.setModelObject(StringUtils.EMPTY); - send(EventCategoryPanel.this.getPage(), Broadcast.BREADTH, new EventSelectionChanged( - target, - Collections.<String>singleton(eventString), - Collections.<String>emptySet())); - target.add(categoryContainer); - } - } - }, ActionLink.ActionType.CREATE, StringUtils.EMPTY); - actionsPanel.add(new ActionLink<EventCategoryTO>() { - - private static final long serialVersionUID = -3722207913631435501L; - - @Override - public void onClick(final AjaxRequestTarget target, final EventCategoryTO ignore) { - if (StringUtils.isNotBlank(custom.getModelObject())) { Pair<EventCategoryTO, AuditElements.Result> parsed = AuditLoggerName.parseEventCategory(custom. getModelObject()); @@ -248,7 +221,7 @@ public abstract class EventCategoryPanel extends Panel { target.add(categoryContainer); } } - }, ActionLink.ActionType.CREATE, StringUtils.EMPTY); + }, ActionLink.ActionType.CREATE, StringUtils.EMPTY).hideLabel(); actionsPanel.add(new ActionLink<EventCategoryTO>() { private static final long serialVersionUID = -3722207913631435521L; @@ -275,12 +248,13 @@ public abstract class EventCategoryPanel extends Panel { target.add(categoryContainer); } } - }, ActionLink.ActionType.DELETE, StringUtils.EMPTY, true); + }, ActionLink.ActionType.DELETE, StringUtils.EMPTY, true).hideLabel(); categoryContainer.add(actionsPanel); actionsPanel.setVisible(false); actionsPanel.setEnabled(false); + actionsPanel.setMarkupId("inline-actions"); eventsContainer.add(new EventSelectionPanel("eventsPanel", eventCategoryTO, model) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2748d00b/client/console/src/main/resources/org/apache/syncope/client/console/events/EventCategoryPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/events/EventCategoryPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/events/EventCategoryPanel.html index 2e3915f..d3e9e02 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/events/EventCategoryPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/events/EventCategoryPanel.html @@ -39,7 +39,7 @@ under the License. <eventLabel wicket:id="customLabel"/> </div> <div id="value"> - <div id="customActions" wicket:id="customActions">[actions]</div> + <div class="pull-right" wicket:id="customActions">[actions]</div> <div id="custom" wicket:id="custom">[custom]</div> </div> </div>
