Repository: syncope Updated Branches: refs/heads/1_1_X 3621adf44 -> dce78dbd0
Fixing a "focus" bug when searching roles. Currently, hitting "enter" on the final textfield doesn't search, but switches tabs instead. Conflicts: console/src/main/java/org/apache/syncope/console/pages/Roles.java Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dce78dbd Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dce78dbd Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dce78dbd Branch: refs/heads/1_1_X Commit: dce78dbd08cd5d29334485337c5282b1e8f0e6d1 Parents: 3621adf Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri May 15 16:35:27 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri May 15 16:49:36 2015 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/console/pages/Roles.java | 33 +++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/dce78dbd/console/src/main/java/org/apache/syncope/console/pages/Roles.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/pages/Roles.java b/console/src/main/java/org/apache/syncope/console/pages/Roles.java index b691073..563c2ee 100644 --- a/console/src/main/java/org/apache/syncope/console/pages/Roles.java +++ b/console/src/main/java/org/apache/syncope/console/pages/Roles.java @@ -104,26 +104,29 @@ public class Roles extends BasePage { final RoleSearchPanel searchPanel = new RoleSearchPanel.Builder("searchPanel").build(); searchForm.add(searchPanel); - searchForm.add(new ClearIndicatingAjaxButton("search", new ResourceModel("search"), getPageReference()) { + final ClearIndicatingAjaxButton searchButton = + new ClearIndicatingAjaxButton("search", new ResourceModel("search"), getPageReference()) { - private static final long serialVersionUID = -958724007591692537L; + private static final long serialVersionUID = -958724007591692537L; - @Override - protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) { - final NodeCond searchCond = searchPanel.buildSearchCond(); - LOG.debug("Node condition {}", searchCond); + @Override + protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) { + final NodeCond searchCond = searchPanel.buildSearchCond(); + LOG.debug("Node condition {}", searchCond); - doSearch(target, searchCond, searchResult); + doSearch(target, searchCond, searchResult); - Session.get().getFeedbackMessages().clear(); - target.add(searchPanel.getSearchFeedback()); - } + Session.get().getFeedbackMessages().clear(); + target.add(searchPanel.getSearchFeedback()); + } - @Override - protected void onError(final AjaxRequestTarget target, final Form<?> form) { - target.add(searchPanel.getSearchFeedback()); - } - }); + @Override + protected void onError(final AjaxRequestTarget target, final Form<?> form) { + target.add(searchPanel.getSearchFeedback()); + } + }; + searchForm.add(searchButton); + searchForm.setDefaultButton(searchButton); } private void doSearch(final AjaxRequestTarget target, final NodeCond searchCond,