Commit ee6c1d3c authored by manohar's avatar manohar

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@96724 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d1a984e0
...@@ -282,10 +282,11 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U ...@@ -282,10 +282,11 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
// 14/03/14 manoharan to avoid link names // 14/03/14 manoharan to avoid link names
tWinName = rs.getString("WIN_NAME"); tWinName = rs.getString("WIN_NAME");
tWinName = (tWinName==null?"":tWinName); tWinName = (tWinName==null?"":tWinName);
if (tWinName.indexOf("/ibase/") > -1) // 31/10/14 manoharan in case of BI / Crystal report uri will be specified so need to include all
{ //if (tWinName.indexOf("/ibase/") > -1)
continue; //{
} // continue;
//}
// added by mahesh // added by mahesh
accFilt = rs.getString("ACC_FILT") == null ? "" : rs.getString("ACC_FILT").trim(); accFilt = rs.getString("ACC_FILT") == null ? "" : rs.getString("ACC_FILT").trim();
...@@ -666,10 +667,20 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U ...@@ -666,10 +667,20 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
System.out.println("windowName ::::"+ windowName); System.out.println("windowName ::::"+ windowName);
System.out.println("rights and winName ::::"+ rights+""+winName); System.out.println("rights and winName ::::"+ rights+""+winName);
if(winName.trim().length() > 2) if(winName.trim().length() > 2)
{ {
objName =winName.substring(2); if (winName.startsWith("w_")) // 31/10/14 manoharan for BI / Crystal reports uri to be allowed
{
objName =winName.substring(2);
}
else if (winName.indexOf("/ibase/") > -1)
{
objName = winName.substring(winName.indexOf("/ibase/"));
}
else
{
objName =winName;
}
} }
System.out.println("objName ::::"+ objName); System.out.println("objName ::::"+ objName);
// commented by manoharan 26/02/13 comma delimiter should not be there in the rights // commented by manoharan 26/02/13 comma delimiter should not be there in the rights
......
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