LPS-12624 Rollback

l15k4 · Nov 11, 2011 · 4ac580d · 4ac580d
1 parent 42f03e8
commit 4ac580d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/portal-web/docroot/html/portlet/asset_publisher/init.jsp b/portal-web/docroot/html/portlet/asset_publisher/init.jsp
@@ -115,8 +115,6 @@ long assetVocabularyId = GetterUtil.getLong(preferences.getValue("assetVocabular
 
 long assetCategoryId = ParamUtil.getLong(request, "categoryId");
 
-long filterCategoryId = ParamUtil.getLong(request, "filterCategoryId");
-
 String assetCategoryTitle = null;
 String assetVocabularyTitle = null;
 
@@ -140,8 +138,6 @@ if (assetCategoryId > 0) {
 
 String assetTagName = ParamUtil.getString(request, "tag");
 
-String filterTagName = ParamUtil.getString(request, "filterTagName");
-
 if (Validator.isNotNull(assetTagName)) {
 	allAssetTagNames = new String[] {assetTagName};
 

diff --git a/portal-web/docroot/html/portlet/asset_publisher/view.jsp b/portal-web/docroot/html/portlet/asset_publisher/view.jsp
@@ -102,20 +102,7 @@ Group group = themeDisplay.getScopeGroup();
 <%
 PortletURL portletURL = renderResponse.createRenderURL();
 
-SearchContainer searchContainer = null;
-
-if (((assetCategoryId > 0) && (assetCategoryId != filterCategoryId)) || (Validator.isNotNull(assetTagName) && !assetTagName.equals(filterTagName))){
-	filterCategoryId = assetCategoryId;
-	filterTagName = assetTagName;
-
-	searchContainer = new SearchContainer(renderRequest, null, null, SearchContainer.DEFAULT_CUR_PARAM, 1, delta, portletURL, null, null);
-}
-else {
-	searchContainer = new SearchContainer(renderRequest, null, null, SearchContainer.DEFAULT_CUR_PARAM, delta, portletURL, null, null);
-}
-
-portletURL.setParameter("filterCategoryId", String.valueOf(filterCategoryId));
-portletURL.setParameter("filterTagName", filterTagName);
+SearchContainer searchContainer = new SearchContainer(renderRequest, null, null, SearchContainer.DEFAULT_CUR_PARAM, delta, portletURL, null, null);
 
 if (!paginationType.equals("none")) {
 	searchContainer.setDelta(delta);