inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
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
This commit is contained in:
Mike Hatfield
2008-05-19 16:00:06 +00:00
parent 9df867cbe5
commit a4937fd9ae
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
View File

@@ -276,6 +276,10 @@ public abstract class BaseTemplateContentServlet extends BaseServlet
throw e; throw e;
} }
} }
finally
{
res.getWriter().close();
}
} }
catch (Throwable txnErr) catch (Throwable txnErr)
{ {

9
source/java/org/alfresco/web/ui/common/Utils.java
View File

@@ -167,15 +167,6 @@ public final class Utils
case '&': enc = "&"; break; //& case '&': enc = "&"; break; //&
case '<': enc = "&lt;"; break; //< case '<': enc = "&lt;"; break; //<
case '>': enc = "&gt;"; 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 //misc
//case 0x80: enc = "&euro;"; break; sometimes euro symbol is ascii 128, should we suport it? //case 0x80: enc = "&euro;"; break; sometimes euro symbol is ascii 128, should we suport it?

13
source/web/scripts/ajax/tiny_mce_wcm_extensions.js vendored
View File

@@ -40,11 +40,24 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
? alfresco.constants.AVM_WEBAPP_URL + href ? alfresco.constants.AVM_WEBAPP_URL + href
: href); : href);
} }
if (href && href.startsWith(document.location.href)) if (href && href.startsWith(document.location.href))
{ {
result = href.substring(document.location.href.length); 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); // dojo.debug("alfresco_TinyMCE_urlconverter_callback('" + href + "', ... , " + onsave + ") = " + result);
return result; return result;
} }

16
source/web/scripts/office/my_tasks.js
View File

@@ -5,6 +5,8 @@
*/ */
var OfficeMyTasks = var OfficeMyTasks =
{ {
MAX_DESCRIPTION: 100,
init: function() init: function()
{ {
OfficeAddin.sortTasks($('taskList')); OfficeAddin.sortTasks($('taskList'));
@@ -47,6 +49,20 @@ var OfficeMyTasks =
dateFormat: "dd MMMM yyyy" 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() setupEventHandlers: function()