mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +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:
@@ -52,7 +52,6 @@ import org.alfresco.service.cmr.repository.ContentData;
|
||||
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.Path;
|
||||
import org.alfresco.service.cmr.search.LimitBy;
|
||||
import org.alfresco.service.cmr.search.ResultSet;
|
||||
import org.alfresco.service.cmr.search.ResultSetRow;
|
||||
@@ -1055,40 +1054,40 @@ public class BrowseBean implements IContextListener
|
||||
return (content != null ? new Long(content.getSize()) : 0L);
|
||||
}
|
||||
};
|
||||
|
||||
public NodePropertyResolver resolverLang = new NodePropertyResolver() {
|
||||
public Object get(Node node) {
|
||||
|
||||
String lang = null;
|
||||
|
||||
if(node.getAspects().contains(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT))
|
||||
{
|
||||
Locale locale = (Locale) node.getProperties().get(ContentModel.PROP_LOCALE);
|
||||
|
||||
// the content filter lang defined by the user
|
||||
String userLang = userPreferencesBean.getContentFilterLanguage();
|
||||
// the node lang
|
||||
String nodeLang = locale.getLanguage();
|
||||
|
||||
// if filter equals all languages : display the lang for each translation
|
||||
if(nodeLang == null)
|
||||
{
|
||||
lang = nodeLang;
|
||||
}
|
||||
|
||||
// if filter is different : display the lang
|
||||
else if (!nodeLang.equalsIgnoreCase(userLang))
|
||||
{
|
||||
lang = nodeLang;
|
||||
}
|
||||
|
||||
// else if the filter is equal to the lang node : nothing to do [lang = null]
|
||||
|
||||
}
|
||||
|
||||
return lang;
|
||||
public NodePropertyResolver resolverLang = new NodePropertyResolver() {
|
||||
public Object get(Node node) {
|
||||
|
||||
String lang = null;
|
||||
|
||||
if (node.getAspects().contains(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT))
|
||||
{
|
||||
Locale locale = (Locale) node.getProperties().get(ContentModel.PROP_LOCALE);
|
||||
|
||||
// the content filter lang defined by the user
|
||||
String userLang = userPreferencesBean.getContentFilterLanguage();
|
||||
// the node lang
|
||||
String nodeLang = locale.getLanguage();
|
||||
|
||||
// if filter equals all languages : display the lang for each translation
|
||||
if (nodeLang == null)
|
||||
{
|
||||
lang = nodeLang;
|
||||
}
|
||||
|
||||
// if filter is different : display the lang
|
||||
else if (!nodeLang.equalsIgnoreCase(userLang))
|
||||
{
|
||||
lang = nodeLang;
|
||||
}
|
||||
|
||||
// else if the filter is equal to the lang node : nothing to do [lang = null]
|
||||
}
|
||||
};
|
||||
|
||||
return lang;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Navigation action event handlers
|
||||
|
Reference in New Issue
Block a user