From ae8c4f9bb5d37f44213fbeaafb45451fb40b0b55 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 3 May 2007 15:50:42 +0000
Subject: [PATCH] MyTasks template task transition commands now refesh page and
 set status message on complete.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/portlets/mytasks_get_html.ftl    | 13 ++++++----
 source/web/scripts/ajax/mytasks.js            | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl
index 41d3a3e2c5..82ca8d0694 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl
@@ -69,7 +69,7 @@
                <#else>
                   </div><div class="taskItem">
                </#if>
-                  ${t.description?html} [${t.name?html}]
+                  ${t.description?html} (${t.type?html})
                   <#if hasDue>
                      (Due: ${due?date})
                   </#if>
@@ -88,13 +88,13 @@
                      <tr><td class="taskMetaprop">Complete:</td><td class="taskMetadata">${t.properties["bpm:percentComplete"]}%</td>
       	         </table>
    	         </div>
-   	         <div class="taskResourceHeader">Resources:</div>
+   	         <div class="taskResourceHeader">${t.name?html}:</div>
    	         <div class="taskResources"></div>
    	         <div>
       	         <table class="taskActions" style="padding-left:16px">
       	            <tr>
       	               <#list t.transitions as wt>
-      	               <td><a class="taskAction" href="${url.context}/command/task/end/${t.id}/${wt.id}">${wt.label}</a></td>
+      	               <td><a class="taskAction" href="#" onclick="MyTasks.transitionTask('/command/task/end/${t.id}/${wt.id}', '${url.service}?f=${filter}', 'Workflow action \'${t.type?html}\' completed.');">${wt.label}</a></td>
       	               </#list>
       	            </tr>
       	         </table>
@@ -110,7 +110,7 @@
 <tr>
 <td bgcolor="#F9F3B0">&nbsp;</td>
 <td>
-   <div class="taskFooter">
+   <div id="taskFooter">
       Showing ${count} <#if filter=4>overdue</#if> task(s)<#if filter=1> due today</#if><#if filter=2> due next week</#if><#if filter=3> with no due date set</#if>.
    </div>
 </td>
@@ -123,6 +123,9 @@
 </tr>
 </table>
 
+<#-- display status message if provided -->
+<#if args.m?exists><script>window.addEvent('load', MyTasks.displayMessage("${args.m}"));</script></#if>
+
 <STYLE type="text/css">
 a.filterLink:link, a.filterLink:visited
 {
@@ -173,7 +176,7 @@ a.filterLinkSelected:link, a.filterLinkSelected:visited
    border-top: 1px solid #FEF8BC;
 }
 
-.taskFooter
+#taskFooter
 {
    width: 700px;
    padding: 8px;
diff --git a/source/web/scripts/ajax/mytasks.js b/source/web/scripts/ajax/mytasks.js
index 64b1c7690b..0db5fedce4 100644
--- a/source/web/scripts/ajax/mytasks.js
+++ b/source/web/scripts/ajax/mytasks.js
@@ -233,6 +233,32 @@ var MyTasks = {
          });
          fxInfo.start(animInfo);
       });
+   },
+   
+   transitionTask: function(tUrl, rUrl, successMessage)
+   {
+      YAHOO.util.Connect.asyncRequest(
+         "GET",
+         getContextPath() + tUrl,
+         { 
+            success: function(response)
+            {
+               window.location.href = rUrl + "&_rand=" + Math.floor(Math.random()*99999) +
+                                      "&" + "m=" + successMessage;
+            },
+            failure: function(e)
+            {
+               alert(e.status + " : ERROR failed to transition task.");
+               window.location.href = rUrl + "&_rand=" + Math.floor(Math.random()*99999);
+            }
+         }
+      );
+   },
+   
+   displayMessage: function(message)
+   {
+      var footer = $('taskFooter');
+      footer.innerHTML = message + ' ' + footer.innerHTML
    }
 };