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

Merge of all UI clustering changes originally applied to 2.2

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-02-15 14:59:11 +00:00
parent d20d8a7007
commit a450598ecb
281 changed files with 17771 additions and 15322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
View File

@@ -86,8 +86,10 @@ import org.alfresco.web.ui.repo.component.UISearchCustomProperties;
*/
public class AdvancedSearchDialog extends BaseDialogBean
{
private static final long serialVersionUID = 3658148969240122732L;
/** PermissionService */
protected PermissionService permissionService;
transient private PermissionService permissionService;
/**
* Default constructor
@@ -109,6 +111,15 @@ public class AdvancedSearchDialog extends BaseDialogBean
this.permissionService = permissionService;
}
protected PermissionService getPermissionService()
{
if (permissionService == null)
{
permissionService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getPermissionService();
}
return permissionService;
}
public void setProperties(SearchProperties properties)
{
this.properties = properties;
@@ -123,7 +134,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
if (allow)
{
NodeRef savedSearchRef = new NodeRef(Repository.getStoreRef(), properties.getSavedSearch());
allow = (this.permissionService.hasPermission(savedSearchRef,
allow = (getPermissionService().hasPermission(savedSearchRef,
PermissionService.WRITE) == AccessStatus.ALLOWED);
}
return allow;
@@ -510,7 +521,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
{
NodeRef searchRef = new NodeRef(Repository.getStoreRef(), properties.getSavedSearch());
Node searchNode = new Node(searchRef);
if (this.nodeService.exists(searchRef) && searchNode.hasPermission(PermissionService.WRITE))
if (getNodeService().exists(searchRef) && searchNode.hasPermission(PermissionService.WRITE))
{
Node node = new Node(searchRef);
properties.setSearchName(node.getName());
@@ -559,7 +570,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
{
DictionaryService dd = services.getDictionaryService();
List<ChildAssociationRef> childRefs = nodeService.getChildAssocs(
List<ChildAssociationRef> childRefs = getNodeService().getChildAssocs(
searchesRef,
ContentModel.ASSOC_CONTAINS,
RegexQNamePattern.MATCH_ALL);
@@ -822,11 +833,11 @@ public class AdvancedSearchDialog extends BaseDialogBean
List<NodeRef> results = null;
try
{
results = searchService.selectNodes(
results = getSearchService().selectNodes(
rootRef,
xpath,
null,
namespaceService,
getNamespaceService(),
false);
}
catch (AccessDeniedException err)
@@ -855,11 +866,11 @@ public class AdvancedSearchDialog extends BaseDialogBean
List<NodeRef> results = null;
try
{
results = searchService.selectNodes(
results = getSearchService().selectNodes(
globalRef,
xpath,
null,
namespaceService,
getNamespaceService(),
false);
}
catch (AccessDeniedException err)
@@ -879,7 +890,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
// create the preferences Node for this user
Map<QName, Serializable> props = new HashMap<QName, Serializable>(2, 1.0f);
props.put(ContentModel.PROP_NAME, user.getUserName());
ChildAssociationRef childRef = nodeService.createNode(
ChildAssociationRef childRef = getNodeService().createNode(
globalRef,
ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.APP_MODEL_1_0_URI, QName.createValidLocalName(user.getUserName())),
@@ -910,11 +921,11 @@ public class AdvancedSearchDialog extends BaseDialogBean
List<NodeRef> results = null;
try
{
results = searchService.selectNodes(
nodeService.getRootNode(Repository.getStoreRef()),
results = getSearchService().selectNodes(
getNodeService().getRootNode(Repository.getStoreRef()),
xpath,
null,
namespaceService,
getNamespaceService(),
false);
}
catch (AccessDeniedException err)
@@ -934,6 +945,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
/**
* Action handler called when the Add button is pressed to add the current Category selection
*/
@SuppressWarnings("unchecked")
public void addCategory(ActionEvent event)
{
UIAjaxCategoryPicker selector = (UIAjaxCategoryPicker)event.getComponent().findComponent("catSelector");