From 20377c9e30eb9f6b83aa64d45a66f317c860bcbe Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Wed, 30 Jul 2008 18:32:52 +0000
Subject: [PATCH] Dashlets link names to profile page

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10143 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../slingshot/docsummary/docsummary.get.js    | 26 ++++++++++++-------
 .../docsummary/docsummary.get.json.ftl        | 23 +++++++++++++---
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js
index 49396c1275..61b26536a7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js
@@ -55,22 +55,28 @@ function getDocs(siteId, filter)
          logger.log("number of results = " + docs.length);
       
       var items = null;
+      var asset = null;
       
       // restrict results to 10 items if necessary
-      if (docs.length > 10)
+      items = new Array();
+      for (var x = 0, y = docs.length; x < 10 && x < y; x++)
       {
-         items = new Array();
-         for (var x = 0; x < 10; x++)
+         asset = docs[x];
+
+         // Get users
+         createdBy = people.getPerson(asset.properties["cm:creator"]);
+         modifiedBy = people.getPerson(asset.properties["cm:modifier"]);
+
+         items.push(
          {
-            items.push(docs[x]);
-         }
-      }
-      else
-      {
-         items = docs;
+            asset: asset,
+            createdBy: createdBy,
+            modifiedBy: modifiedBy
+         });
       }
       
-      return ({
+      return (
+      {
          "items": items
       });
    }
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.json.ftl
index 2f89262505..9133015b81 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.json.ftl
@@ -5,7 +5,20 @@
    <#else>
       "items":
       [
-      <#list docs.items as d>
+      <#list docs.items as item>
+         <#assign d = item.asset>
+         <#if item.createdBy?exists>
+            <#assign createdBy = (item.createdBy.properties.firstName + " " + item.createdBy.properties.lastName)?trim>
+            <#assign createdByUser = item.createdBy.properties.userName>
+         <#else>
+            <#assign createdBy="" createdByUser="">
+         </#if>
+         <#if item.modifiedBy?exists>
+            <#assign modifiedBy = (item.modifiedBy.properties.firstName + " " + item.modifiedBy.properties.lastName)?trim>
+            <#assign modifiedByUser = item.modifiedBy.properties.userName>
+         <#else>
+            <#assign modifiedBy="" modifiedByUser="">
+         </#if>
          {
             "nodeRef": "${d.nodeRef}",
             "icon16": "${d.icon16}",
@@ -14,11 +27,13 @@
             "title": "${d.properties.title!""}",
             "description": "${d.properties.description!""}",
             "createdOn": <#noescape>"${d.properties.created?datetime}"</#noescape>,
-            "createdBy": "${d.properties.creator}",
+            "createdBy": "${createdBy}",
+            "createdByUser": "${createdByUser}",
             "modifiedOn": <#noescape>"${d.properties.modified?datetime}"</#noescape>,
-            "modifiedBy": "${d.properties.modifier}",
+            "modifiedBy": "${modifiedBy}",
+            "modifiedByUser": "${modifiedByUser}",
             "contentUrl": "/api/node/content/${d.storeType}/${d.storeId}/${d.id}"
-         }<#if d_has_next>,</#if>
+         }<#if item_has_next>,</#if>
       </#list>
       ]
    </#if>