#13 Re-Enable the edit of standard fields

echocat · Apr 4, 2014 · 44b0790 · 44b0790
1 parent f8f08f5
commit 44b0790
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/org/echocat/adam/profile/ExtendedEditMyProfileAction.java b/src/main/java/org/echocat/adam/profile/ExtendedEditMyProfileAction.java
@@ -21,7 +21,6 @@
 
 package org.echocat.adam.profile;
 
-import com.atlassian.confluence.user.AuthenticatedUserThreadLocal;
 import com.atlassian.confluence.user.ConfluenceUser;
 import com.atlassian.confluence.user.actions.EditMyProfileAction;
 import org.echocat.adam.profile.element.ElementModel;
@@ -32,6 +31,9 @@
 import static org.apache.commons.lang3.StringUtils.join;
 import static org.echocat.adam.profile.ProfileModelProvider.profileModelProvider;
 import static org.echocat.adam.profile.ProfileProvider.profileProvider;
+import static org.echocat.adam.profile.element.ElementModel.EMAIL_ELEMENT_ID;
+import static org.echocat.adam.profile.element.ElementModel.FULL_NAME_ELEMENT_ID;
+import static org.echocat.adam.profile.element.ElementModel.USER_NAME_ELEMENT_ID;
 
 @SuppressWarnings("deprecation")
 public class ExtendedEditMyProfileAction extends EditMyProfileAction {
@@ -53,11 +55,11 @@ public String doEdit() throws Exception {
     private void updateFields(@Nonnull Profile profile) {
         for (final Group group : profileModelProvider().get()) {
             for (final ElementModel elementModel : group) {
-                if (!elementModel.isStandard()) {
-                    final String id = elementModel.getId();
+                final String id = elementModel.getId();
+                if (!id.equals(FULL_NAME_ELEMENT_ID) && !id.equals(EMAIL_ELEMENT_ID) && !id.equals(USER_NAME_ELEMENT_ID)) {
                     final String[] plainValues = _parameters.get(id);
                     final String plainValue = plainValues != null && plainValues.length > 0 ? join(plainValues, ' ') : null;
-                    if (plainValue != null && elementModel.getAccess().checkEdit(AuthenticatedUserThreadLocal.get(), profile).isEditAllowed()) {
+                    if (plainValue != null && elementModel.getAccess().checkEdit(getAuthenticatedUser(), profile).isEditAllowed()) {
                         profile.setValue(elementModel, plainValue);
                     }
                 }

diff --git a/src/main/java/org/echocat/adam/profile/ExtendedEditUserAction.java b/src/main/java/org/echocat/adam/profile/ExtendedEditUserAction.java
@@ -32,6 +32,7 @@
 import static org.apache.commons.lang3.StringUtils.join;
 import static org.echocat.adam.profile.ProfileModelProvider.profileModelProvider;
 import static org.echocat.adam.profile.ProfileProvider.profileProvider;
+import static org.echocat.adam.profile.element.ElementModel.*;
 
 public class ExtendedEditUserAction extends EditUserAction {
 
@@ -53,8 +54,8 @@ public String doEdit() throws Exception {
     private void updateFields(@Nonnull Profile profile) {
         for (final Group group : profileModelProvider().get()) {
             for (final ElementModel elementModel : group) {
-                if (!elementModel.isStandard()) {
-                    final String id = elementModel.getId();
+                final String id = elementModel.getId();
+                if (!id.equals(FULL_NAME_ELEMENT_ID) && !id.equals(EMAIL_ELEMENT_ID) && !id.equals(USER_NAME_ELEMENT_ID)) {
                     final String[] plainValues = _parameters.get(id);
                     final String plainValue = plainValues != null && plainValues.length > 0 ? join(plainValues, ' ') : null;
                     if (plainValue != null && elementModel.getAccess().checkEdit(AuthenticatedUserThreadLocal.get(), profile).isEditAllowed()) {

diff --git a/src/main/java/org/echocat/adam/profile/element/ElementModel.java b/src/main/java/org/echocat/adam/profile/element/ElementModel.java
@@ -36,6 +36,8 @@ public interface ElementModel extends Localized {
     @Nonnull
     public static final String FULL_NAME_ELEMENT_ID = "fullName";
     @Nonnull
+    public static final String USER_NAME_ELEMENT_ID = "username";
+    @Nonnull
     public static final String EMAIL_ELEMENT_ID = "email";
     @Nonnull
     public static final String WEBSITE_ELEMENT_ID = "website";