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 for another regression in the Advanced Search UI after recent dialog changes

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-10-04 16:13:50 +00:00
parent 464717c6ff
commit 219d0738ef
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,11 +140,6 @@ public class AdvancedSearchDialog extends BaseDialogBean
*/ */
public DataModel getCategoriesDataModel() public DataModel getCategoriesDataModel()
{ {
if (properties.getCategoriesDataModel() == null)
{
properties.setCategoriesDataModel(new ListDataModel());
}
properties.getCategoriesDataModel().setWrappedData(properties.getCategories()); properties.getCategoriesDataModel().setWrappedData(properties.getCategories());
return properties.getCategoriesDataModel(); return properties.getCategoriesDataModel();

8
source/java/org/alfresco/web/bean/SearchProperties.java
View File

@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.faces.model.DataModel; import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.model.SelectItem; import javax.faces.model.SelectItem;
import org.alfresco.repo.cache.ExpiringValueCache; import org.alfresco.repo.cache.ExpiringValueCache;
@@ -101,7 +102,7 @@ public class SearchProperties
private List<Node> categories = new ArrayList<Node>(2); private List<Node> categories = new ArrayList<Node>(2);
/** datamodel for table of categories to search */ /** datamodel for table of categories to search */
private DataModel categoriesDataModel = null; private DataModel categoriesDataModel = new ListDataModel();
/** title attribute to search */ /** title attribute to search */
private String title = null; private String title = null;
@@ -336,11 +337,6 @@ public class SearchProperties
return categoriesDataModel; return categoriesDataModel;
} }
public void setCategoriesDataModel(DataModel categoriesDataModel)
{
this.categoriesDataModel = categoriesDataModel;
}
public String getTitle() public String getTitle()
{ {
return title; return title;