You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/05/18 14:38:33 UTC
[1/6] syncope git commit: Fixing a "focus" bug when searching roles.
Currently, hitting "enter" on the final textfield doesn't search,
but switches tabs instead.
Repository: syncope
Updated Branches:
refs/heads/1_2_X ac920f0b1 -> 4f7746a31
refs/heads/master 7c6b20129 -> 665aaf39d
Fixing a "focus" bug when searching roles. Currently, hitting "enter" on the final textfield doesn't search, but switches tabs instead.
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ac920f0b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ac920f0b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ac920f0b
Branch: refs/heads/master
Commit: ac920f0b199b9903579786c7a53359839bad5eb9
Parents: 4f65a92
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri May 15 16:35:27 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri May 15 16:35:27 2015 +0100
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/Roles.java | 36 +++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac920f0b/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 fa94ee4..9ce3d51 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
@@ -111,26 +111,30 @@ 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 String fiql = searchPanel.buildFIQL();
- LOG.debug("Node condition {}", fiql);
-
- doSearch(target, fiql, searchResult);
+ @Override
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
+ final String fiql = searchPanel.buildFIQL();
+ LOG.debug("Node condition {}", fiql);
- Session.get().getFeedbackMessages().clear();
- searchPanel.getSearchFeedback().refresh(target);
- }
+ doSearch(target, fiql, searchResult);
- @Override
- protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- searchPanel.getSearchFeedback().refresh(target);
- }
- });
+ Session.get().getFeedbackMessages().clear();
+ searchPanel.getSearchFeedback().refresh(target);
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form<?> form) {
+ searchPanel.getSearchFeedback().refresh(target);
+ }
+ };
+
+ searchForm.add(searchButton);
+ searchForm.setDefaultButton(searchButton);
}
private void doSearch(final AjaxRequestTarget target, final String fiql,
[2/6] syncope git commit: Updating Tomcat version
Posted by il...@apache.org.
Updating Tomcat version
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/795f0268
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/795f0268
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/795f0268
Branch: refs/heads/1_2_X
Commit: 795f0268dab2ae357802c471ae0682871fece38f
Parents: 4f65a92
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 18 14:34:02 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 18 14:34:02 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/795f0268/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 59dc0f4..ad7601c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,7 @@ under the License.
<httpclient.version>4.3.6</httpclient.version>
- <tomcat.version>7.0.61</tomcat.version>
+ <tomcat.version>7.0.62</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>
[4/6] syncope git commit: Merge branch '1_2_X' of
https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Posted by il...@apache.org.
Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4f7746a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4f7746a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4f7746a3
Branch: refs/heads/master
Commit: 4f7746a3165ba2130a05c8102d6ba61ecbb1737b
Parents: 795f026 ac920f0
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 18 14:34:57 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 18 14:34:57 2015 +0200
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/Roles.java | 36 +++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[3/6] syncope git commit: Updating Tomcat version
Posted by il...@apache.org.
Updating Tomcat version
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/795f0268
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/795f0268
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/795f0268
Branch: refs/heads/master
Commit: 795f0268dab2ae357802c471ae0682871fece38f
Parents: 4f65a92
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 18 14:34:02 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 18 14:34:02 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/795f0268/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 59dc0f4..ad7601c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,7 @@ under the License.
<httpclient.version>4.3.6</httpclient.version>
- <tomcat.version>7.0.61</tomcat.version>
+ <tomcat.version>7.0.62</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>
[6/6] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Conflicts:
console/src/main/java/org/apache/syncope/console/pages/Roles.java
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/665aaf39
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/665aaf39
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/665aaf39
Branch: refs/heads/master
Commit: 665aaf39d5a8e2fd8664d33c6b5d1aa599023c32
Parents: 7c6b201 4f7746a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 18 14:38:09 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 18 14:38:09 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] syncope git commit: Merge branch '1_2_X' of
https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Posted by il...@apache.org.
Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4f7746a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4f7746a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4f7746a3
Branch: refs/heads/1_2_X
Commit: 4f7746a3165ba2130a05c8102d6ba61ecbb1737b
Parents: 795f026 ac920f0
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 18 14:34:57 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 18 14:34:57 2015 +0200
----------------------------------------------------------------------
.../org/apache/syncope/console/pages/Roles.java | 36 +++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------