From ffff8cedd7f8e56e575a026fd9f632c5055fc3ae Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 21 Jul 2011 16:20:54 +0000 Subject: [PATCH] User Profile Following UI enhancements as per SE.S79, SE.S80, SE.S81, SE.S82 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AbstractSubscriptionServiceWebScript.java | 29 ++++++++++++------- .../SubscriptionServicePrivateListPut.java | 3 +- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java b/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java index 19f81ffb24..acd67de2f0 100644 --- a/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java @@ -78,30 +78,36 @@ public abstract class AbstractSubscriptionServiceWebScript extends AbstractWebSc if (obj instanceof JSONObject || obj instanceof JSONArray) { res.setContentEncoding("UTF-8"); - + Writer writer = res.getWriter(); if (obj instanceof JSONObject) { ((JSONObject) obj).write(writer); - } else + } + else { ((JSONArray) obj).write(writer); } writer.flush(); - } else + } + else { res.setStatus(204); } - } catch (SubscriptionsDisabledException sde) + } + catch (SubscriptionsDisabledException sde) { throw new WebScriptException(404, "Subscription service is disabled!", sde); - } catch (NoSuchPersonException nspe) + } + catch (NoSuchPersonException nspe) { throw new WebScriptException(404, "Unknown user '" + nspe.getUserName() + "'!", nspe); - } catch (PrivateSubscriptionListException psle) + } + catch (PrivateSubscriptionListException psle) { throw new WebScriptException(403, "Subscription list is private!", psle); - } catch (JSONException je) + } + catch (JSONException je) { throw new WebScriptException(500, "Unable to parse or serialize JSON!", je); } @@ -112,18 +118,19 @@ public abstract class AbstractSubscriptionServiceWebScript extends AbstractWebSc protected int parseNumber(String name, String number, int def) { - if (number != null && number.length() > 0) { try { return Integer.parseInt(number); - } catch (NumberFormatException e) + } + catch (NumberFormatException e) { throw new WebScriptException(400, name + " is not a number!", e); } - } else + } + else { return def; } @@ -148,6 +155,8 @@ public abstract class AbstractSubscriptionServiceWebScript extends AbstractWebSc result.put("userName", username); result.put("firstName", nodeService.getProperty(node, ContentModel.PROP_FIRSTNAME)); result.put("lastName", nodeService.getProperty(node, ContentModel.PROP_LASTNAME)); + result.put("jobtitle", nodeService.getProperty(node, ContentModel.PROP_JOBTITLE)); + result.put("organization", nodeService.getProperty(node, ContentModel.PROP_ORGANIZATION)); String status = (String) nodeService.getProperty(node, ContentModel.PROP_USER_STATUS); if (status != null) diff --git a/source/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListPut.java b/source/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListPut.java index 42a7a1f7a6..ad52cc772a 100644 --- a/source/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListPut.java +++ b/source/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListPut.java @@ -39,7 +39,8 @@ public class SubscriptionServicePrivateListPut extends SubscriptionServicePrivat if (setPrivate.equalsIgnoreCase("true")) { subscriptionService.setSubscriptionListPrivate(userId, true); - } else if (setPrivate.equalsIgnoreCase("false")) + } + else if (setPrivate.equalsIgnoreCase("false")) { subscriptionService.setSubscriptionListPrivate(userId, false); }