[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller SimpleRegistration.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller
In directory jcorp2.servlets.net:/tmp/cvs-serv20293/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller

Modified Files:
	SimpleRegistration.java 
Log Message:
bug fix - on registration object update, fields set not to display would be overwritten with data from another users' record


Index: SimpleRegistration.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** SimpleRegistration.java	17 May 2004 19:33:29 -0000	1.27
--- SimpleRegistration.java	17 May 2004 23:07:29 -0000	1.28
***************
*** 1808,1811 ****
--- 1808,1823 ----
                      request.getParameter(dbname + "." + fieldName));
              }
+             
+ 			RegistrationObjectMap rom = new RegistrationObjectMap();
+ 			rom.setDataContext(request.getDataContext());
+ 			rom.setField("RegDomId", rd.getField("RegDomId"));
+ 			rom.setField("RegObj", dbname);
+ 
+ 			if (!rom.find()) {
+ 				throw new ControllerException(
+ 					"Cannot find registration object map entry");
+ 			}
+ 
+ 			db.setField(rom.getField("UidField"), user.getUid());
  
              if (!db.find()) {
***************
*** 1838,1856 ****
                  return;
              }
- 
-             RegistrationObjectMap rom = new RegistrationObjectMap();
-             rom.setDataContext(request.getDataContext());
-             rom.setField("RegDomId", rd.getField("RegDomId"));
-             rom.setField("RegObj", dbname);
- 
-             if (!rom.find()) {
-                 throw new ControllerException(
-                     "Cannot find registration object map entry");
-             }
- 
-             uidFieldName = rom.getField("UidField");
-             db.setField(uidFieldName, user.getUid());
- 
-             db.setField(rom.getField("UidField"), user.getUid());
  
              if (metadata.isField("IPAddress")) {
--- 1850,1853 ----