filtering of win_name not having /ibase/ removed and obj_name set is win_name in such cases

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96729 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-sys/ibase/webitm/ejb/sys/UserRightsPrc.java

@@ -1187,7 +1187,16 @@ public class UserRightsPrc extends ProcessEJB implements  UserRightsPrcLocal , U
 				if(!menuNameMap.containsKey(tKey))
 					menuNameMap.put(tKey, tMenuName);
 
-				winNameMap.put(tKey, tWinName.trim().substring(2, tWinName.trim().length()));
+				//winNameMap.put(tKey, tWinName.trim().substring(2, tWinName.trim().length()));
+				if (tWinName.indexOf("/ibase/") > -1)
+				{
+					winNameMap.put(tKey, tWinName.substring(tWinName.indexOf("/ibase/")));
+				}
+				else
+				{
+					winNameMap.put(tKey, tWinName.trim().substring(2, tWinName.trim().length()));
+				}
+
 				gotUserRights = (String) userRightsMap.get(tKey);
 				if(gotUserRights == null || gotUserRights.trim().length() == 0){
 					gotUserRights = getUserRights(profileId, tApplication, tLevel1, tLevel2, tLevel3, tLevel4, tLevel5, conn);
@@ -1241,7 +1250,16 @@ public class UserRightsPrc extends ProcessEJB implements  UserRightsPrcLocal , U
 					if(!menuNameMap.containsKey(tKey))
 						menuNameMap.put(tKey, tMenuName);
 
-					winNameMap.put(tKey, tWinName.trim().substring(2, tWinName.trim().length()));
+					//winNameMap.put(tKey, tWinName.trim().substring(2, tWinName.trim().length()));
+					if (tWinName.indexOf("/ibase/") > -1)
+					{
+						winNameMap.put(tKey, tWinName.substring(tWinName.indexOf("/ibase/")));
+					}
+					else
+					{
+						winNameMap.put(tKey, tWinName.trim().substring(2, tWinName.trim().length()));
+					}
+					
 					gotUserRights = (String) userRightsMap.get(tKey);
 					if(gotUserRights == null || gotUserRights.trim().length() == 0){
 						gotUserRights = getUserRights(profileId, tApplication, tLevel1, tLevel2, tLevel3, tLevel4, tLevel5, conn);