mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-16 17:55:15 +00:00
MySpaces webscript now shows Ajax wait animation while loading inner panel area.
Summary pop-up panel fade-out anim removed (improves user experience). Reorg of broken action evaluator class hiearchy (after ML UI changes). More fixes to ML UI (browse.jsp missing component IDs breaks screen when panels collapsed then expanded). Code reorg in interceptors to help performance. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
parent
5d3bee634f
commit
8f0d52af04
@ -74,12 +74,13 @@ public class MLContentInterceptor implements MethodInterceptor
|
||||
public Object invoke(MethodInvocation invocation) throws Throwable
|
||||
{
|
||||
String methodName = invocation.getMethod().getName();
|
||||
Object[] args = invocation.getArguments();
|
||||
|
||||
Object ret = null;
|
||||
|
||||
if (methodName.equals("getReader"))
|
||||
{
|
||||
Object[] args = invocation.getArguments();
|
||||
|
||||
NodeRef nodeRef = (NodeRef) args[0];
|
||||
|
||||
// Shortcut it if the node is not an empty translation
|
||||
|
@ -67,7 +67,6 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
||||
{
|
||||
private static Log logger = LogFactory.getLog(MLPropertyInterceptor.class);
|
||||
|
||||
|
||||
private static ThreadLocal<Boolean> mlAware = new ThreadLocal<Boolean>();
|
||||
|
||||
/** Direct access to the NodeService */
|
||||
@ -118,25 +117,26 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
||||
@SuppressWarnings("unchecked")
|
||||
public Object invoke(MethodInvocation invocation) throws Throwable
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("Intercepting method " + invocation.getMethod().getName() + " using content filter " + I18NUtil.getContentLocale());
|
||||
}
|
||||
|
||||
// If isMLAware then no treatment is done, just return
|
||||
if (isMLAware())
|
||||
{
|
||||
// Don't interfere
|
||||
return invocation.proceed();
|
||||
}
|
||||
|
||||
Object ret = null;
|
||||
|
||||
String methodName = invocation.getMethod().getName();
|
||||
Object[] args = invocation.getArguments();
|
||||
|
||||
// What locale must be used for filtering
|
||||
Locale contentLocale = I18NUtil.getContentLocale();
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("Intercepting method " + methodName + " using content filter " + contentLocale);
|
||||
}
|
||||
|
||||
Object ret = null;
|
||||
|
||||
// If isMLAware then no treatment is done, just return
|
||||
if(isMLAware())
|
||||
{
|
||||
// Don't interfere
|
||||
return invocation.proceed();
|
||||
}
|
||||
|
||||
if (methodName.equals("getProperty"))
|
||||
{
|
||||
NodeRef nodeRef = (NodeRef) args[0];
|
||||
|
Loading…
x
Reference in New Issue
Block a user