From e01d3dda4d937f7b6bcc545adbe0ecf710a49add Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Thu, 12 Mar 2009 12:38:17 +0000
Subject: [PATCH] Merged V3.1 to HEAD    13418: ETHREEOH-1478 - Mimetype is
 incorrectly determined    13419: Favourites list in Sites menu and My Sites
 dashlets could mismatch    13421: ETHREEOH-1487 - Fix some UI text
 inconsistencies    13434: ETHREEOH-1495 - Name / URL shortname etc needs to
 be space trimmed at beginning and end of input    13478: ETHREEOH-1531 -
 "Adhoc Task" Workflow doesn't work (Oracle DB)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../webscripts/org/alfresco/office/myTasks.get.html.ftl       | 2 +-
 .../org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
index 263e8b5421..4dbe70448f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
@@ -117,7 +117,7 @@
             <div class="taskValue">
                <select id="wrkType" style="width: 178px;">
                   <option value="review" selected>${message("office.workflow.review")}</option>
-                  <option value="adhoc">${message("office.workflow.review")}</option>
+                  <option value="adhoc">${message("office.workflow.adhoc")}</option>
                </select>
             </div>
             <div class="taskParam">${message("office.property.assign_to")}:</div>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl
index d33f3fd924..fc0eef1a1b 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/dashlets/my-tasks.get.json.ftl
@@ -45,8 +45,8 @@
       [
 <#list task.transitions as transition>
          {
-            "id": "${transition.id}",
-            "label": "${transition.label}"
+            "id": "${transition.id!""}",
+            "label": "${transition.label!""}"
          }<#if transition_has_next>,</#if>
 </#list>
       ]