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/12/07 13:55:54 UTC
[1/2] syncope git commit: [SYNCOPE-156] Fix long-standing bug in
realm explorer
Repository: syncope
Updated Branches:
refs/heads/master 81e141b02 -> f5ebfe1a4
[SYNCOPE-156] Fix long-standing bug in realm explorer
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9cfe3fbc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9cfe3fbc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9cfe3fbc
Branch: refs/heads/master
Commit: 9cfe3fbc1aa99ae32f9090eec1baed0b8334c440
Parents: 81e141b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Dec 7 13:37:14 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Dec 7 13:37:14 2015 +0100
----------------------------------------------------------------------
.../org/apache/syncope/client/console/commons/AnyDataProvider.java | 2 +-
.../apache/syncope/client/console/rest/AnyObjectRestClient.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9cfe3fbc/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
index f36d3c5..a4ffcae 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
@@ -97,7 +97,7 @@ public class AnyDataProvider<T extends AnyTO> extends SortableDataProvider<T, St
if (filtered) {
result = fiql == null ? 0 : restClient.searchCount(realm, fiql, type);
} else {
- result = restClient.count(type, realm);
+ result = restClient.count(realm, type);
}
return result;
http://git-wip-us.apache.org/repos/asf/syncope/blob/9cfe3fbc/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
index b845eb7..a063534 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
@@ -48,7 +48,7 @@ public class AnyObjectRestClient extends AbstractAnyRestClient<AnyObjectTO> {
}
@Override
- public int count(final String type, final String realm) {
+ public int count(final String realm, final String type) {
return getService(AnyObjectService.class).list(
type, new AnyListQuery.Builder().realm(realm).page(1).size(1).build()).getTotalCount();
}
[2/2] syncope git commit: [SYNCOPE-156] Minor look change
Posted by il...@apache.org.
[SYNCOPE-156] Minor look change
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f5ebfe1a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f5ebfe1a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f5ebfe1a
Branch: refs/heads/master
Commit: f5ebfe1a4d11e87423e74c683a506b6d941ef53b
Parents: 9cfe3fb
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Dec 7 13:55:44 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Dec 7 13:55:44 2015 +0100
----------------------------------------------------------------------
.../main/resources/META-INF/resources/css/syncopeConsole.css | 8 ++++++++
.../org/apache/syncope/client/console/pages/BasePage.html | 1 -
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f5ebfe1a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
index ed2cda2..122e5e2 100644
--- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
+++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
@@ -240,6 +240,14 @@ div.realms div.summarize {
height: 55px
}
+.navbar .footer a {
+ height: 40px
+}
+
+.navbar .user-footer a {
+ height: 40px
+}
+
span.overridable div.checkbox {
float: right;
margin: 0px;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f5ebfe1a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
index 243ee5f..7314bb3 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
@@ -88,7 +88,6 @@ under the License.
<ul class="dropdown-menu">
<li class="user-footer">
<div class="pull-left">
- <a href="#" class="btn btn-default btn-flat">Profile</a>
</div>
<div class="pull-right">
<a href="#" class="btn btn-default btn-flat" wicket:id="logout"><wicket:message key="logout"/></a>