From a4937fd9aef5ffa74cbaf22c0baab2006484e2e9 Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Mon, 19 May 2008 16:00:06 +0000
Subject: [PATCH] Merged V2.2 to HEAD   8630: Merged V2.1 to V2.2      8513:
 Fixed AR-2157: Integrity checking fails when target roles are present on
 child associations      8517: Fixed AR-2171: NPE restoring large hierarchy   
   8519: New workflow description field limited to 100 characters (AWC-1938)  
    8520: Removed copy of mysql connector to tomcat distribution      8529:
 Fix for pop-up task panel, when task has due date      8537: Fix for AWC-1951
      8538: AR-2141: Problem copying large hierarchical folder structures     
 8594: Closing of servlet output stream in TemplateContentServlet      8616:
 Fix for WCM-1134 (editing rich text area, causes relative links to become
 absolute in IE)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../app/servlet/BaseTemplateContentServlet.java  |  4 ++++
 .../java/org/alfresco/web/ui/common/Utils.java   |  9 ---------
 .../web/scripts/ajax/tiny_mce_wcm_extensions.js  | 13 +++++++++++++
 source/web/scripts/office/my_tasks.js            | 16 ++++++++++++++++
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
index a1c245f534..c7637f8dc3 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
@@ -276,6 +276,10 @@ public abstract class BaseTemplateContentServlet extends BaseServlet
                   throw e;
                }
             }
+            finally
+            {
+               res.getWriter().close();
+            }
          }
          catch (Throwable txnErr)
          {
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index a3a7266505..f7c3bd6f57 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -167,15 +167,6 @@ public final class Utils
             case '&': enc = "&amp;"; break;     //&
             case '<': enc = "&lt;"; break;      //<
             case '>': enc = "&gt;"; break;      //>
-             
-            //german umlauts
-            case '\u00E4' : enc = "&auml;";  break;
-            case '\u00C4' : enc = "&Auml;";  break;
-            case '\u00F6' : enc = "&ouml;";  break;
-            case '\u00D6' : enc = "&Ouml;";  break;
-            case '\u00FC' : enc = "&uuml;";  break;
-            case '\u00DC' : enc = "&Uuml;";  break;
-            case '\u00DF' : enc = "&szlig;"; break;
             
             //misc
             //case 0x80: enc = "&euro;"; break;  sometimes euro symbol is ascii 128, should we suport it?
diff --git a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
index 47f72da733..148d510f22 100644
--- a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
+++ b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
@@ -40,11 +40,24 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
               ? alfresco.constants.AVM_WEBAPP_URL + href
               : href);
   }
+  
   if (href && href.startsWith(document.location.href))
   {
     result = href.substring(document.location.href.length);
   }
+  
+  // handle URL issue with IE (WCM-1134)
+  if (tinyMCE.isMSIE)
+  {
+     var server = document.location.protocol + "//" + document.location.host;
+     if (href && href.startsWith(server))
+     {
+        result = href.substring(server.length);
+     }
+  }
+
 //  dojo.debug("alfresco_TinyMCE_urlconverter_callback('" + href + "', ... , " + onsave + ") = " + result);
+  
   return result;
 }
 
diff --git a/source/web/scripts/office/my_tasks.js b/source/web/scripts/office/my_tasks.js
index 621d71bf0a..609e1d8d2d 100644
--- a/source/web/scripts/office/my_tasks.js
+++ b/source/web/scripts/office/my_tasks.js
@@ -5,6 +5,8 @@
  */
 var OfficeMyTasks =
 {
+   MAX_DESCRIPTION: 100,
+   
    init: function()
    {
       OfficeAddin.sortTasks($('taskList'));
@@ -47,6 +49,20 @@ var OfficeMyTasks =
             dateFormat: "dd MMMM yyyy"
          });
       }
+      
+      if ($('wrkDescription'))
+      {
+         var desc = $('wrkDescription');
+         
+         desc.onkeyup = desc.onchange = desc.onblur = function(event)
+         {
+            if (this.value.length > OfficeMyTasks.MAX_DESCRIPTION)
+            {
+              this.setProperty('value', this.getProperty('value').substr(0, OfficeMyTasks.MAX_DESCRIPTION));
+            }
+         }
+         
+      }
    },
 
    setupEventHandlers: function()