Move description field

git-svn-id: https://svn.argeo.org/commons/trunk@3396 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java
index 0ea573ccbbac5549fa10924096687d1d3ced111f..815170a6a8bece078aaabf3fb014682b7cf8c158 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/CoworkerUserNatureMapper.java
@@ -10,11 +10,10 @@ public class CoworkerUserNatureMapper implements UserNatureMapper {
 
        public UserNature mapUserInfoFromContext(DirContextOperations ctx) {
                CoworkerNature nature = new CoworkerNature();
-               nature.setDescription(ctx.getStringAttribute("description"));
                nature.setMobile(ctx.getStringAttribute("mobile"));
                nature.setTelephoneNumber(ctx.getStringAttribute("telephoneNumber"));
 
-               if (nature.getDescription() == null && nature.getMobile() == null
+               if (nature.getMobile() == null
                                && nature.getTelephoneNumber() == null)
                        return null;
                else
@@ -24,9 +23,6 @@ public class CoworkerUserNatureMapper implements UserNatureMapper {
        public void mapUserInfoToContext(UserNature userInfoArg,
                        DirContextAdapter ctx) {
                CoworkerNature nature = (CoworkerNature) userInfoArg;
-               if (nature.getDescription() != null) {
-                       ctx.setAttributeValue("description", nature.getDescription());
-               }
                if (nature.getMobile() == null || !nature.getMobile().equals("")) {
                        ctx.setAttributeValue("mobile", nature.getMobile());
                }

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.java
index 9cad98d68b13b9e3baf1da4a99f7be68f2fa0372..c9d1efd7a98c1ad038e2c13184d2af18bf50f98b 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/nature/SimpleUserNatureMapper.java
@@ -13,6 +13,7 @@ public class SimpleUserNatureMapper implements UserNatureMapper {
                nature.setLastName(ctx.getStringAttribute("sn"));
                nature.setFirstName(ctx.getStringAttribute("givenName"));
                nature.setEmail(ctx.getStringAttribute("mail"));
+               nature.setDescription(ctx.getStringAttribute("description"));
                return nature;
        }
 
@@ -24,6 +25,9 @@ public class SimpleUserNatureMapper implements UserNatureMapper {
                ctx.setAttributeValue("sn", nature.getLastName());
                ctx.setAttributeValue("givenName", nature.getFirstName());
                ctx.setAttributeValue("mail", nature.getEmail());
+               if (nature.getDescription() != null) {
+                       ctx.setAttributeValue("description", nature.getDescription());
+               }
        }
 
        public Boolean supports(UserNature userNature) {

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/CoworkerNature.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/CoworkerNature.java
index f7cb425d087012b1ac0519106de7275ea07b3776..3b16b863ae6cf090d38ab5baaa38aca42f2a08e3 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/CoworkerNature.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/CoworkerNature.java
@@ -4,18 +4,9 @@ import org.argeo.security.UserNature;
 
 public class CoworkerNature extends UserNature {
        private static final long serialVersionUID = 1L;
-       private String description;
        private String mobile;
        private String telephoneNumber;
 
-       public String getDescription() {
-               return description;
-       }
-
-       public void setDescription(String description) {
-               this.description = description;
-       }
-
        public String getMobile() {
                return mobile;
        }

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/SimpleUserNature.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/SimpleUserNature.java
index ce986d51c24cdaaa28c2febacde00e8abad23799..34b27ac34fee3dd1ef255653f3cec1339a405f53 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/SimpleUserNature.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/nature/SimpleUserNature.java
@@ -7,6 +7,7 @@ public class SimpleUserNature extends UserNature {
        private String email;
        private String firstName;
        private String lastName;
+       private String description;
 
        public String getEmail() {
                return email;
@@ -32,4 +33,12 @@ public class SimpleUserNature extends UserNature {
                this.lastName = lastName;
        }
 
+       public String getDescription() {
+               return description;
+       }
+
+       public void setDescription(String description) {
+               this.description = description;
+       }
+
 }