Author: ruchith
Date: Wed Dec 5 03:39:10 2007
New Revision: 10548
Log:
Fixed IDENTITY-143
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreAction.java
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/userstore.jsp
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreAction.java
Wed Dec 5 03:39:10 2007
@@ -31,6 +31,8 @@
private String configName;
+ private boolean showEditStore = false;
+
public String getRealmClassName() {
return realmClassName;
}
@@ -38,13 +40,19 @@
public String execute() throws Exception {
if (this.configName == null) {
- return ERROR;
+ return ERROR;
}
IPPersistenceManager db = IPPersistenceManager.getPersistanceManager();
RealmConfigurationDO config =
db.getRealmConfiguration(this.configName);
realmClassName = config.getRealm().getClassName();
configProperties = config.getConfigProperties();
+ if (configProperties.size() == 0) {
+ this.addInfoMessage(getText("no_user_store_config"));
+ } else {
+ this.showEditStore = true;
+ }
+ this.loadMessages();
return SUCCESS;
}
@@ -60,4 +68,8 @@
this.configName = configName;
}
+ public boolean isShowEditStore() {
+ return showEditStore;
+ }
+
}
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
Wed Dec 5 03:39:10 2007
@@ -17,6 +17,7 @@
cert-invalid = Invalid certificate
unable_to_verify_string = Your request is invalid or expired! Please try again.
successful_verification = You are successfully verified. You may login now!!
+no_user_store_config = No configuration properties available for this user
store
add_claim_duplicate_claim = Duplicate claim : {0}
add_claim_uri_null = Claim URI missing
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/userstore.jsp
==============================================================================
--- trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/userstore.jsp
(original)
+++ trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/userstore.jsp
Wed Dec 5 03:39:10 2007
@@ -33,21 +33,32 @@
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowRealmConfigurations.action">Available User
Stores</a> | User store configuration</div>
<h1 class="headding-userstores">User store
configuration : <s:property value="configName"/></h1>
<h2>Configuration Properties</h2>
- <table cellpadding="0" cellspacing="0"
border="0" class="data-table">
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <s:iterator value="configProperties">
- <tr><td><s:property
value="name"/></td>
- <td><s:property
value="value"/><br/></td></tr>
- </s:iterator>
- </table>
-
- <s:url id="showRealmConfigUrl" namespace="/"
action="ShowUserStoreEdit">
- <s:param name="configName" value="configName" />
- </s:url>
- <s:a href="%{showRealmConfigUrl}">Edit</s:a>
+ <s:iterator value="errorMessages">
+ <p><font color="#FF0000"><s:property /></font></p>
+ </s:iterator>
+
+ <s:iterator value="infoMessages">
+ <p><font color="#00FF00"><s:property /></font></p>
+ </s:iterator>
+
+ <s:if test="showEditStore">
+ <table cellpadding="0" cellspacing="0"
border="0" class="data-table">
+ <tr>
+ <th>Name</th>
+ <th>Value</th>
+ </tr>
+ <s:iterator
value="configProperties">
+ <tr><td><s:property
value="name"/></td>
+ <td><s:property
value="value"/><br/></td></tr>
+ </s:iterator>
+ </table>
+
+ <s:url id="showRealmConfigUrl" namespace="/"
action="ShowUserStoreEdit">
+ <s:param name="configName"
value="configName" />
+ </s:url>
+
+ <s:a href="%{showRealmConfigUrl}">Edit</s:a>
+ </s:if>
</td>
</tr>
</table>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
