From aa61dae7b0960f44dcd020a51c2e01d6ed484887 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 13 Oct 2009 10:57:47 +0000 Subject: [PATCH] Merged V3.2 to HEAD 15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter 15203: ETHREEOH-2246: Rework patch.authorityMigration to be more performant and report progress 15254: ETHREEOH-2339: Fixed NullPointerException when editing LDAP-synced user who doesn't have an email address 15267: Applied patch for ETHREEOH-1448: Exception when using the move up/down button when editting a web form 15270: Mereg (sic) - Record only 15238 15285: Merged V3.1 to V3.2 15281: Merged V2.2 to V3.1 15280: Absorb all metadata exceptions at all levels 15282: Merged V2.2 to V3.1 15273: Merged V3.2 to V2.2 15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter ------------------------- Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.2:r15273,15280 Merged /alfresco/BRANCHES/V3.1:r15281-15282 Merged /alfresco/BRANCHES/V3.2:r15200,15203,15254,15267,15270,15285 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/bean/users/EditUserDetailsDialog.java | 9 ++++++--- .../java/org/alfresco/web/forms/xforms/XFormsBean.java | 10 ---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java b/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java index 3dbea8e363..821efa5b5b 100644 --- a/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java @@ -142,7 +142,8 @@ public class EditUserDetailsDialog extends BaseDialogBean public String getEmail() { - return person.getProperties().get(ContentModel.PROP_EMAIL).toString(); + Object value = person.getProperties().get(ContentModel.PROP_EMAIL); + return value == null ? null : value.toString(); } public void setEmail(String email) @@ -152,7 +153,8 @@ public class EditUserDetailsDialog extends BaseDialogBean public String getFirstName() { - return person.getProperties().get(ContentModel.PROP_FIRSTNAME).toString(); + Object value = person.getProperties().get(ContentModel.PROP_FIRSTNAME); + return value == null ? null : value.toString(); } public void setFirstName(String firstName) @@ -162,7 +164,8 @@ public class EditUserDetailsDialog extends BaseDialogBean public String getLastName() { - return person.getProperties().get(ContentModel.PROP_LASTNAME).toString(); + Object value = person.getProperties().get(ContentModel.PROP_LASTNAME); + return value == null ? null : value.toString(); } public String getPersonDescription() diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java index 6b07141879..3ed199e25b 100644 --- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java +++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java @@ -506,21 +506,11 @@ public class XFormsBean implements Serializable LOGGER.debug("inserting node before " + beforeLocation); instance.insertNode(fromLocationPath, beforeLocation); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REBUILD, null); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.RECALCULATE, null); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REVALIDATE, null); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REFRESH, null); - if (LOGGER.isDebugEnabled()) LOGGER.debug("deleting from " + from.getLocationPath()); // need to reload from location path since it has moved instance.deleteNode(from.getLocationPath()); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REBUILD, null); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.RECALCULATE, null); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REVALIDATE, null); - model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REFRESH, null); - to.getRepeat().setIndex(toPosition); model.getContainer().dispatch(model.getTarget(), XFormsEventNames.REBUILD, null);