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 2016/06/17 13:08:29 UTC
[2/2] syncope git commit: [SYNCOPE-871] Minor stuff (formatting,
cursor pointer on number widget instances)
[SYNCOPE-871] Minor stuff (formatting, cursor pointer on number widget instances)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/57580628
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/57580628
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/57580628
Branch: refs/heads/master
Commit: 57580628bc6d7f87e83a6f93c838d69b7bfd9b4d
Parents: 20681c8
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Jun 17 15:07:17 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Jun 17 15:08:17 2016 +0200
----------------------------------------------------------------------
.../org/apache/syncope/client/console/pages/Realms.java | 9 +++++----
.../org/apache/syncope/client/console/panels/Realm.java | 3 ++-
.../apache/syncope/client/console/widgets/NumberWidget.java | 9 ++++++++-
.../apache/syncope/client/console/widgets/NumberWidget.html | 2 +-
4 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/57580628/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
index 574e9fa..f73839f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
@@ -137,6 +137,7 @@ public class Realms extends BasePage {
try {
updateRealmContent(realmChoicePanel.getCurrentRealm(), parameters.get("selectedIndex").toInteger());
} catch (Exception e) {
+ LOG.debug("Unexpected error", e);
updateRealmContent(realmChoicePanel.getCurrentRealm(), 0);
}
}
@@ -147,12 +148,12 @@ public class Realms extends BasePage {
if (event.getPayload() instanceof ChosenRealm) {
@SuppressWarnings("unchecked")
- final ChosenRealm<RealmTO> choosenRealm = ChosenRealm.class.cast(event.getPayload());
+ ChosenRealm<RealmTO> choosenRealm = ChosenRealm.class.cast(event.getPayload());
updateRealmContent(choosenRealm.getObj(), 0);
choosenRealm.getTarget().add(content);
} else if (event.getPayload() instanceof AjaxWizard.NewItemEvent) {
- final AjaxWizard.NewItemEvent<?> newItemEvent = AjaxWizard.NewItemEvent.class.cast(event.getPayload());
- final WizardModalPanel<?> modalPanel = newItemEvent.getModalPanel();
+ AjaxWizard.NewItemEvent<?> newItemEvent = AjaxWizard.NewItemEvent.class.cast(event.getPayload());
+ WizardModalPanel<?> modalPanel = newItemEvent.getModalPanel();
if (event.getPayload() instanceof AjaxWizard.NewItemActionEvent && modalPanel != null) {
final IModel<Serializable> model = new CompoundPropertyModel<>(modalPanel.getItem());
@@ -239,7 +240,7 @@ public class Realms extends BasePage {
} catch (Exception e) {
LOG.error("While deleting realm", e);
// Escape line breaks
- SyncopeConsoleSession.get().error(e.getMessage().replace("\n", " "));
+ SyncopeConsoleSession.get().error(e.getMessage().replace("\n", " "));
}
SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/57580628/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
index 562f641..cb92360 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
@@ -61,7 +61,8 @@ public abstract class Realm extends Panel {
this.realmTO = realmTO;
this.anyTypeTOs = anyTypeRestClient.list();
- AjaxBootstrapTabbedPanel tabbedPanel = new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList(pageRef));
+ AjaxBootstrapTabbedPanel<ITab> tabbedPanel =
+ new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList(pageRef));
tabbedPanel.setSelectedTab(selectedIndex);
add(tabbedPanel);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/57580628/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
index 3c4f6dd..386cc89 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
@@ -49,7 +49,10 @@ public class NumberWidget extends BaseWidget {
WebMarkupContainer box = new WebMarkupContainer("box");
box.add(new AttributeAppender("class", " " + bg));
box.add(new AjaxEventBehavior("onmousedown") {
- @Override
+
+ private static final long serialVersionUID = -7133385027739964990L;
+
+ @Override
protected void onEvent(final AjaxRequestTarget target) {
List<AnyTypeTO> anyTypeTOs = new AnyTypeRestClient().list();
PageParameters pageParameters = new PageParameters();
@@ -58,10 +61,12 @@ public class NumberWidget extends BaseWidget {
pageParameters.add("selectedIndex", 1);
setResponsePage(Realms.class, pageParameters);
break;
+
case "totalGroups":
pageParameters.add("selectedIndex", 2);
setResponsePage(Realms.class, pageParameters);
break;
+
case "totalAny1OrRoles":
if (icon.equals("ion ion-gear-a")) {
Collections.sort(anyTypeTOs, new AnyTypeComparator());
@@ -78,6 +83,7 @@ public class NumberWidget extends BaseWidget {
setResponsePage(Roles.class);
}
break;
+
case "totalAny2OrResources":
if (icon.equals("ion ion-gear-a")) {
Collections.sort(anyTypeTOs, new AnyTypeComparator());
@@ -94,6 +100,7 @@ public class NumberWidget extends BaseWidget {
setResponsePage(Topology.class);
}
break;
+
default:
pageParameters.add("selectedIndex", 0);
setResponsePage(Realms.class, pageParameters);
http://git-wip-us.apache.org/repos/asf/syncope/blob/57580628/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
index 12fcb11..d10b829 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
@@ -24,7 +24,7 @@ under the License.
<h3><span wicket:id="number"/></h3>
<p><span wicket:id="label"/></p>
</div>
- <div class="icon">
+ <div class="icon" style="cursor: pointer;">
<i wicket:id="icon"></i>
</div>
</div>