Author: chathura
Date: Wed Jan 23 03:31:47 2008
New Revision: 12764
Log:
Fixed the issues caused when having numbers in user names and role names.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
Wed Jan 23 03:31:47 2008
@@ -125,14 +125,14 @@
try {
- String[] userPermissions = permissionString.split("1");
+ String[] userPermissions = permissionString.split("\\|");
for (int i = 0; i < userPermissions.length; i++) {
if (userPermissions[i].trim().length() == 0) {
continue;
}
- String[] permissions = userPermissions[i].split("2");
+ String[] permissions = userPermissions[i].split(":");
String permUser = permissions[0];
if (!(permUser.equals(RegistryConstants.SYSTEM_USER) ||
@@ -149,7 +149,7 @@
}
for (int j = 1; j < permissions.length; j++) {
- String[] permission = permissions[j].split("3");
+ String[] permission = permissions[j].split("-");
String action = permission[0];
String checked = permission[1];
@@ -293,14 +293,14 @@
try {
- String[] rolePermissions = permissionString.split("1");
+ String[] rolePermissions = permissionString.split("\\|");
for (int i = 0; i < rolePermissions.length; i++) {
if (rolePermissions[i].trim().length() == 0) {
continue;
}
- String[] permissions = rolePermissions[i].split("2");
+ String[] permissions = rolePermissions[i].split(":");
String permRole = permissions[0];
if (!permRole.equals(RegistryConstants.ADMIN_ROLE)) {
@@ -311,7 +311,7 @@
}
for (int j = 1; j < permissions.length; j++) {
- String[] permission = permissions[j].split("3");
+ String[] permission = permissions[j].split("-");
String action = permission[0];
String checked = permission[1];
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Wed Jan
23 03:31:47 2008
@@ -122,10 +122,10 @@
var perm = pForm.elements[i];
if(pForm.elements[i].name.substring(0,7)!="nonuser") {
if (currentUser != perm.name) {
- msgBody=msgBody + "1" + perm.name + "2" + perm.value + "3"
+ perm.checked;
+ msgBody=msgBody + "|" + perm.name + ":" + perm.value + "-"
+ perm.checked;
currentUser = perm.name;
} else {
- msgBody=msgBody + "2" + perm.value + "3" + perm.checked;
+ msgBody=msgBody + ":" + perm.value + "-" + perm.checked;
}
}
}
@@ -158,10 +158,10 @@
var perm = pForm.elements[i];
if(pForm.elements[i].name.substring(0,7)!="nonuser") {
if (currentUser != perm.name) {
- msgBody=msgBody + "1" + perm.name + "2" + perm.value + "3"
+ perm.checked;
+ msgBody=msgBody + "|" + perm.name + ":" + perm.value + "-"
+ perm.checked;
currentUser = perm.name;
} else {
- msgBody=msgBody + "2" + perm.value + "3" + perm.checked;
+ msgBody=msgBody + ":" + perm.value + "-" + perm.checked;
}
}
}
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
