[Sandev-cvs] sand/platform/tools/src/org/sandev/tools/HTTP AbstractXHTMLFormAdaptor.java, 1.80, 1.81

[Eric P. <th...@us...>]

Update of /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/HTTP
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32511

Modified Files:
	AbstractXHTMLFormAdaptor.java 
Log Message:
Added rule to downgrade UNRESTRICTEDNODISP down to READONLYNODISP rather
than just READONLY in the case of instance or class write restrictions
since it is non-intuitive to have the fields suddenly show up in the
display in that case.


Index: AbstractXHTMLFormAdaptor.java
===================================================================
RCS file: /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/HTTP/AbstractXHTMLFormAdaptor.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** AbstractXHTMLFormAdaptor.java	20 Nov 2009 22:30:46 -0000	1.80
--- AbstractXHTMLFormAdaptor.java	31 Jan 2010 19:33:56 -0000	1.81
***************
*** 3833,3837 ****
              if(access>AuthFilter.AUTH_NOACCESS) {
                  int fieldAcc=filter.messageFieldAccess(user,msg,fieldname);
!                 access=Math.min(access,fieldAcc); }
              return access;
          } catch(SandException e) {
--- 3833,3841 ----
              if(access>AuthFilter.AUTH_NOACCESS) {
                  int fieldAcc=filter.messageFieldAccess(user,msg,fieldname);
!                 if((fieldAcc==AuthFilter.AUTH_UNRESTRICTEDNODISP)&&
!                    (access==AuthFilter.AUTH_READONLY)) {
!                     access=AuthFilter.AUTH_READONLYNODISP; }
!                 else {
!                     access=Math.min(access,fieldAcc); } }
              return access;
          } catch(SandException e) {