Skip to content

B
business-java
Commit 0a2d7689 authored by manohar's avatar manohar
Browse files
Options

Merged the changes done on 26/02/13 at Sun Unique - he validation for rights... 

Merged the changes done on 26/02/13 at Sun Unique - he validation for rights char was not proper it was accepting char delimited by comma like A,E,V  where as it should accept AEV. Also $ and # also should be accepted like * these are for comments and attachment.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92818 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d1962df1
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 16 deletions
webitm-sys/ibase/webitm/ejb/sys/UserRightsPrc.java
View file @ 0a2d7689
......@@ -416,6 +416,7 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
Node parentNode = null;
Node childNode = null;
String childNodeName = "";
String rightChar = "";
boolean bDetailFound = false;
int parentNodeListLength = 0;
......@@ -575,12 +576,11 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
objName =winName.substring(2);
}
System.out.println("objName ::::"+ objName);
// commented by manoharan 26/02/13 comma delimiter should not be there in the rights
//added by akhilesh on 08/oct/12
String rightStr[] = rights.split(",");
for(int i= 0 ; i<rightStr.length; i++)
{
//String rightStr[] = rights.split(",");
//for(int i= 0 ; i<rightStr.length; i++)
//{
ArrayList relArray = new ArrayList(); // added by akhilesh on 31/oct/12
ArrayList relArray1 = new ArrayList(); // added by akhilesh on 07/nov/12
......@@ -592,7 +592,7 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
{
relArray.add(rs.getString(1));
}
System.out.println("relArray and rights value"+relArray+""+rightStr[i]);
System.out.println("relArray and rights value"+relArray);
rs.close();
rs = null;
......@@ -608,15 +608,20 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
{
relArray1.add(rs.getString(1));
}
System.out.println("relArray1 and rights value"+relArray1+""+rightStr[i]);
System.out.println("relArray1 and rights value"+relArray1);
rs.close();
rs = null;
pSelectStmt.close();
pSelectStmt = null;
//ended by akhilesh
if(!(relArray1.contains(rightStr[i]) || relArray.contains(rightStr[i]) || "*".equals(rightStr[i]) || "".equals(rightStr[i])))
rightChar = "";
for (int iCtr = 0; iCtr < rights.length(); iCtr++)
{
rightChar = rights.substring(iCtr,1);
System.out.println("relArray ["+relArray+" ] rightChar ["+ rightChar + "] rights [" + rights + "]");
//if(!(relArray1.contains(rightStr[i]) || relArray.contains(rightStr[i]) || "*".equals(rightStr[i]) || "".equals(rightStr[i])))
if(!(relArray1.contains(rightChar) || relArray.contains(rightChar) || "*".equals(rightChar) || "".equals(rightChar) || "$".equals(rightChar) || "#".equals(rightChar) ))
{
System.out.println("r************"+relArray+""+rights);
returnString="VTRIGHT";
......@@ -624,11 +629,14 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
return returnString;
}
}
//}
//ended by akhilesh
/*}commented by akhilesh on 31/oct/12
else
rights = null;*/
}
}
......@@ -672,7 +680,9 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
String searchStr = null;
searchStr = (String)subMenuList.get(index);
objName = "";
System.out.print("obj name @@@@@@@@@@@@"+objName+""+searchStr+""+index+""+subMenuList.size());
System.out.print("searchStr [" + searchStr +"]["+index+"]["+subMenuList.size() + "]");
System.out.print("winNameMap ["+ winNameMap + "]");
System.out.print("menuNameMap [" + menuNameMap + "]");
objName = (String)winNameMap.get(searchStr);
System.out.print("obj name @@@@@@@@@@@@"+objName+""+searchStr+""+index+""+subMenuList.size());
//Get parameters from searchStr
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment