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

Fix up to some less-than-ideal code to some recent dialog/wizard refactoring from usethelink

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-10-15 16:17:13 +00:00
parent f5309d2ea5
commit fc8c9d1175
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/web/bean/AdvancedSearchDialog.java
View File

@@ -28,7 +28,6 @@ import java.io.Serializable;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,13 +36,10 @@ import javax.faces.component.UISelectBoolean;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.model.SelectItem;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.dictionary.AspectDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -53,7 +49,6 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AccessStatus;
@@ -91,6 +86,9 @@ import org.alfresco.web.ui.repo.component.UISearchCustomProperties;
*/
public class AdvancedSearchDialog extends BaseDialogBean
{
/** PermissionService */
protected PermissionService permissionService;
/**
* Default constructor
*/
@@ -102,9 +100,15 @@ public class AdvancedSearchDialog extends BaseDialogBean
properties.getPanels().put(PANEL_CUSTOM, false);
}
// ------------------------------------------------------------------------------
// Bean property getters and setters
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
}
public void setProperties(SearchProperties properties)
{
this.properties = properties;
@@ -119,8 +123,8 @@ public class AdvancedSearchDialog extends BaseDialogBean
if (allow)
{
NodeRef savedSearchRef = new NodeRef(Repository.getStoreRef(), properties.getSavedSearch());
allow = (properties.getPermissionService().hasPermission(savedSearchRef,
PermissionService.WRITE) == AccessStatus.ALLOWED);
allow = (this.permissionService.hasPermission(savedSearchRef,
PermissionService.WRITE) == AccessStatus.ALLOWED);
}
return allow;
}
@@ -270,6 +274,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
return properties.getContentFormats();
}
// ------------------------------------------------------------------------------
// Action event handlers
@@ -1035,6 +1040,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
return null;
}
// ------------------------------------------------------------------------------
// Private data