modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java | 8 ++++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 19 +++++++++- modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 19 +++++++++- 3 files changed, 44 insertions(+), 2 deletions(-)
New commits: commit 1fa4fa83c8c3a805a04ca35c2c9586e4675bd903 Author: Joseph Marques joseph@redhat.com Date: Tue Jul 27 15:28:50 2010 -0400
BZ-616656: BZ-601189: fix searching and pagination on IE6
For IE6, revert back to a standard h:inputText element instead of the new SearchBar (thus, IE6 will not support search suggestions or saved searches). This eliminates the javascript error bubbling up from the SmartGWT library, which prevents further interaction on the page from succeeding (clicking the go button as well as pagination).
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java index 67b654f..7a5a8d5 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set;
+import javax.servlet.http.HttpServletRequest; + import com.sun.facelets.tag.AbstractTagLibrary;
import org.rhq.core.clientapi.util.units.DateFormatter; @@ -443,4 +445,10 @@ public class FunctionTagLibrary extends AbstractTagLibrary { AlertSender sender = alertSenderPluginManager.getAlertSenderForNotification(alertNotification); return sender.previewConfiguration(); } + + public static boolean isIE6() { + HttpServletRequest request = FacesContextUtility.getRequest(); + String userAgent = request.getHeader("User-Agent").toLowerCase(); + return (userAgent.indexOf("msie") != -1 && userAgent.indexOf("6.0") != -1); + } } \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml index 3683968..52245bf 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml @@ -41,6 +41,8 @@ <p/> <h:panelGrid columns="3"> <h:outputText value="Search: " /> + + <c:if test="#{!onf:isIE6()}"> <ui:include src="/rhq/common/searchInterface.xhtml"> <ui:param name="searchButtonId" value="browseGroupsForm:searchButtonJSF" /> <ui:param name="searchSubsystem" value="GROUP" /> @@ -48,7 +50,6 @@ <ui:param name="defaultSavedSearchPatternId" value="#{param.searchId}" /> <ui:param name="subtab" value="${param.subtab}" /> </ui:include> - <a4j:commandButton id="searchButtonJSF" value="GO" reRender="browseGroupsDataTable, browseGroupsDataTableScroller, inventoryBrowserErrorPanel" status="commonStatus" @@ -60,6 +61,22 @@ onclick="applySearchFilter(getElementCrossBrowser('patternField').value);"> <s:defaultAction/> </a4j:commandButton> + </c:if> + + <c:if test="#{onf:isIE6()}"> + <h:inputText style="width: 800px; min-width: 800px;" value="#{BrowseGroupsUIBean.search}"/> + <a4j:commandButton id="searchButtonJSF" value="GO" + reRender="browseGroupsDataTable, browseGroupsDataTableScroller, inventoryBrowserErrorPanel" + status="commonStatus" + actionListener="#{BrowseGroupsUIBean.clearDataModel}" + styleClass="buttonmed" + similarityGroupingId="searchRequest" + requestDelay="50" + ignoreDupResponses="true"> + <s:defaultAction/> + </a4j:commandButton> + </c:if> + </h:panelGrid> <p/>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml index c7f43c7..dacc5cb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml @@ -41,6 +41,8 @@ <p/> <h:panelGrid columns="3"> <h:outputText value="Search: " /> + + <c:if test="#{!onf:isIE6()}"> <ui:include src="/rhq/common/searchInterface.xhtml"> <ui:param name="searchButtonId" value="browseResourcesForm:searchButtonJSF" /> <ui:param name="searchSubsystem" value="RESOURCE" /> @@ -48,7 +50,6 @@ <ui:param name="defaultSavedSearchPatternId" value="#{param.searchId}" /> <ui:param name="subtab" value="${param.subtab}" /> </ui:include> - <a4j:commandButton id="searchButtonJSF" value="GO" reRender="browseResourcesDataTable, browseResourcesDataTableScroller, inventoryBrowserErrorPanel" status="commonStatus" @@ -60,6 +61,22 @@ onclick="applySearchFilter(getElementCrossBrowser('patternField').value);"> <s:defaultAction/> </a4j:commandButton> + </c:if> + + <c:if test="#{onf:isIE6()}"> + <h:inputText style="width: 800px; min-width: 800px;" value="#{BrowseResourcesUIBean.search}"/> + <a4j:commandButton id="searchButtonJSF" value="GO" + reRender="browseResourcesDataTable, browseResourcesDataTableScroller, inventoryBrowserErrorPanel" + status="commonStatus" + actionListener="#{BrowseResourcesUIBean.clearDataModel}" + styleClass="buttonmed" + similarityGroupingId="searchRequest" + requestDelay="50" + ignoreDupResponses="true"> + <s:defaultAction/> + </a4j:commandButton> + </c:if> + </h:panelGrid> <p/>
rhq-commits@lists.fedorahosted.org