From 7dbdd4729c30d82136a0fef83e1f6efb3cab2324 Mon Sep 17 00:00:00 2001 From: redsolo Date: Wed, 4 Jun 2008 14:40:58 +0000 Subject: [PATCH] [FIXED HUDSON-1793] JSONObject no longer is null in UserPropertyDecriptor.newInstance(StaplerRequest, JSONObject) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@9819 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/User.java | 8 +++++++- core/src/main/resources/hudson/model/User/configure.jelly | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 8171313985..ab0a30ab00 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -3,6 +3,7 @@ package hudson.model; import com.thoughtworks.xstream.XStream; import hudson.CopyOnWrite; import hudson.FeedAdapter; +import hudson.StructuredForm; import hudson.Util; import hudson.XmlFile; import hudson.model.Descriptor.FormException; @@ -12,6 +13,8 @@ import hudson.security.Permission; import hudson.security.PermissionGroup; import hudson.util.RunList; import hudson.util.XStream2; +import net.sf.json.JSONObject; + import org.acegisecurity.Authentication; import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken; import org.kohsuke.stapler.Stapler; @@ -356,9 +359,12 @@ public class User extends AbstractModelObject implements AccessControlled { fullName = req.getParameter("fullName"); description = req.getParameter("description"); + JSONObject json = StructuredForm.get(req); + List props = new ArrayList(); + int i=0; for (Descriptor d : UserProperties.LIST) { - UserProperty p = d.newInstance(req, null); + UserProperty p = d.newInstance(req, json.getJSONObject("userProperty"+(i++))); p.setUser(this); props.add(p); } diff --git a/core/src/main/resources/hudson/model/User/configure.jelly b/core/src/main/resources/hudson/model/User/configure.jelly index 1ff7aaa131..2642be1e50 100644 --- a/core/src/main/resources/hudson/model/User/configure.jelly +++ b/core/src/main/resources/hudson/model/User/configure.jelly @@ -22,7 +22,10 @@ - + + + +