From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster
---
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java
index 831b9e2..cb149d7 100644
--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
*/
package com.oracle.solaris.vp.panels.usermgr.client.swing;
@@ -90,6 +90,7 @@
new GroupsSettings(),
new RolesSettings(),
new RightsSettings(),
+ new AuthRightsSettings(),
new AuthsSettings()
};
@@ -97,6 +98,7 @@
private AdvancedSettings roleSettings[] = {
new GroupsSettings(),
new RightsSettings(),
+ new AuthRightsSettings(),
new AuthsSettings()
};
@@ -108,6 +110,7 @@
private String title = Finder.getString("usermgr.advanced.title");
private MutableProperty<String> rightsProperty = new StringProperty();
+ private MutableProperty<String> authRightsProperty = new StringProperty();
private MutableProperty<String> rolesProperty = new StringProperty();
private MutableProperty<String> groupsProperty = new StringProperty();
private MutableProperty<String> authsProperty = new StringProperty();
--
Gitblit v1.9.3