Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6EC4FE9C5 for ; Mon, 25 Feb 2013 11:50:13 +0000 (UTC) Received: (qmail 86282 invoked by uid 500); 25 Feb 2013 11:50:13 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 86238 invoked by uid 500); 25 Feb 2013 11:50:12 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 86212 invoked by uid 99); 25 Feb 2013 11:50:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 11:50:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 11:50:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A8FBA2388980; Mon, 25 Feb 2013 11:49:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1449668 - in /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages: NotificationModalPage.java ResourceModalPage.java RoleModalPage.java UserModalPage.java Users.java Date: Mon, 25 Feb 2013 11:49:50 -0000 To: commits@syncope.apache.org From: fmartelli@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130225114950.A8FBA2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmartelli Date: Mon Feb 25 11:49:50 2013 New Revision: 1449668 URL: http://svn.apache.org/r1449668 Log: SYNCOPE-309 Fixed on the branch Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff ============================================================================== --- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original) +++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Mon Feb 25 11:49:50 2013 @@ -236,6 +236,7 @@ class NotificationModalPage extends Base MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, allowedRoles); form.add(submit); + form.setDefaultButton(submit); add(form); } Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff ============================================================================== --- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java (original) +++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java Mon Feb 25 11:49:50 2013 @@ -136,6 +136,8 @@ public class ResourceModalPage extends B }; form.add(submit); + form.setDefaultButton(submit); + add(form); MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, xmlRolesReader.getAllAllowedRoles("Resources", Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff ============================================================================== --- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original) +++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Mon Feb 25 11:49:50 2013 @@ -113,6 +113,7 @@ public class RoleModalPage extends BaseM : "update")); form.add(submit); + form.setDefaultButton(submit); add(form); } Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff ============================================================================== --- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original) +++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Mon Feb 25 11:49:50 2013 @@ -173,6 +173,7 @@ public abstract class UserModalPage exte fragment.add(form); form.add(submit); + form.setDefaultButton(submit); return form; } Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java?rev=1449668&r1=1449667&r2=1449668&view=diff ============================================================================== --- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java (original) +++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java Mon Feb 25 11:49:50 2013 @@ -93,27 +93,31 @@ public class Users extends BasePage { final UserSearchPanel searchPanel = new UserSearchPanel("searchPanel", getPageReference()); 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) { + @Override + protected void onError(final AjaxRequestTarget target, final Form form) { - target.add(searchPanel.getSearchFeedback()); - } - }); + target.add(searchPanel.getSearchFeedback()); + } + }; + + searchForm.add(searchButton); + searchForm.setDefaultButton(searchButton); } private void doSearch(final AjaxRequestTarget target, final NodeCond searchCond, final ResultSetPanel resultsetPanel) {