#433 temporarily deactivated multi-column-search-position

TheCoder4eu · Jun 24, 2016 · dc95bce · dc95bce
1 parent e2651e6
commit dc95bce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 39 deletions.
diff --git a/src/main/java/net/bootsfaces/component/dataTable/DataTableCore.java b/src/main/java/net/bootsfaces/component/dataTable/DataTableCore.java
@@ -45,7 +45,6 @@ protected enum PropertyKeys {
 		largeScreen,
 		mediumScreen,
 		multiColumnSearch,
-		multiColumnSearchPosition,
 		offset,
 		offsetLg,
 		offsetMd,
@@ -360,22 +359,6 @@ public void setMultiColumnSearch(boolean _multiColumnSearch) {
 		getStateHelper().put(PropertyKeys.multiColumnSearch, _multiColumnSearch);
 	}
 
-	/**
-	 * Doesn't work yet. Should the multi-column-search attributes be at the bottom or the top of the table? Legal values: 'top','botton', and 'both'. Default to 'bottom'. <P>
-	 * @return Returns the value of the attribute, or null, if it hasn't been set by the JSF file.
-	 */
-	public String getMultiColumnSearchPosition() {
-		return (String) getStateHelper().eval(PropertyKeys.multiColumnSearchPosition, "bottom");
-	}
-
-	/**
-	 * Doesn't work yet. Should the multi-column-search attributes be at the bottom or the top of the table? Legal values: 'top','botton', and 'both'. Default to 'bottom'. <P>
-	 * Usually this method is called internally by the JSF engine.
-	 */
-	public void setMultiColumnSearchPosition(String _multiColumnSearchPosition) {
-		getStateHelper().put(PropertyKeys.multiColumnSearchPosition, _multiColumnSearchPosition);
-	}
-
 	/**
 	 * Integer value to specify how many columns to offset. <P>
 	 * @return Returns the value of the attribute, or null, if it hasn't been set by the JSF file.

diff --git a/src/main/java/net/bootsfaces/component/dataTable/DataTableRenderer.java b/src/main/java/net/bootsfaces/component/dataTable/DataTableRenderer.java
@@ -117,10 +117,10 @@ private void generateFooter(FacesContext context, DataTable dataTable, ResponseW
 		boolean hasFooter = false;
 		boolean hasSearchbar = false;
 		if (dataTable.isMultiColumnSearch()) {
-			String position = dataTable.getMultiColumnSearchPosition();
-			if ("both".equalsIgnoreCase(position) || "bottom".equalsIgnoreCase(position)) {
+//			String position = dataTable.getMultiColumnSearchPosition();
+//			if ("both".equalsIgnoreCase(position) || "bottom".equalsIgnoreCase(position)) {
 				hasSearchbar = true;
-			}
+//			}
 		}
 		for (UIComponent column : dataTable.getChildren()) {
 			if (!column.isRendered()) {
@@ -361,12 +361,12 @@ private void generateHeader(FacesContext context, DataTable dataTable, ResponseW
 		rw.endElement("tr");
 		if (false) {
 			// Putting input fields into the header doesn't work yet
-			if (dataTable.isMultiColumnSearch()) {
-				String position = dataTable.getMultiColumnSearchPosition();
-				if ("both".equalsIgnoreCase(position) || "top".equalsIgnoreCase(position)) {
-					generateMultiColumnSearchRow(context, dataTable, rw);
-				}
-			}
+//			if (dataTable.isMultiColumnSearch()) {
+//				String position = dataTable.getMultiColumnSearchPosition();
+//				if ("both".equalsIgnoreCase(position) || "top".equalsIgnoreCase(position)) {
+//					generateMultiColumnSearchRow(context, dataTable, rw);
+//				}
+//			}
 		}
 
 		rw.endElement("thead");

diff --git a/src/main/meta/META-INF/bootsfaces-b.taglib.xml b/src/main/meta/META-INF/bootsfaces-b.taglib.xml
@@ -4962,18 +4962,6 @@
 		  <required>false</required>
 		  <type>java.lang.Boolean</type>
 		</attribute>
-		<attribute>
-		  <description><![CDATA[Doesn't work yet. Should the multi-column-search attributes be at the bottom or the top of the table? Legal values: 'top','botton', and 'both'. Default to 'bottom'.]]></description>
-		  <name>multi-column-search-position</name>
-		  <required>false</required>
-		  <type>java.lang.String</type>
-		</attribute>
-		<attribute>
-		  <description><![CDATA[Doesn't work yet. Should the multi-column-search attributes be at the bottom or the top of the table? Legal values: 'top','botton', and 'both'. Default to 'bottom'.]]></description>
-		  <name>multiColumnSearchPosition</name>
-		  <required>false</required>
-		  <type>java.lang.String</type>
-		</attribute>
 		<attribute>
 		  <description><![CDATA[Integer value to specify how many columns to offset.]]></description>
 		  <name>offset</name>

diff --git a/xtext/BootsFaces.jsfdsl b/xtext/BootsFaces.jsfdsl
@@ -471,7 +471,7 @@ widget dataTable
     immediate            Boolean                                           "Flag indicating that, if this component is activated by the user, notifications should be delivered to interested listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke Application phase. Default is false."
 	lang                 String                                            "Configured lang for the dataTable. If no default language is configured, the language configured in the browser is used."
     multi-column-search  Boolean                                           "If true, &lt;b:inputText /&gt; fields will be generated at the bottom of each column which allow you to perform per-column filtering."
-    multi-column-search-position default "bottom"                          "Doesn't work yet. Should the multi-column-search attributes be at the bottom or the top of the table? Legal values: 'top','botton', and 'both'. Default to 'bottom'."
+//    multi-column-search-position default "bottom"                          "Doesn't work yet. Should the multi-column-search attributes be at the bottom or the top of the table? Legal values: 'top','botton', and 'both'. Default to 'bottom'."
     onclick                                                                "The onclick attribute."
     oncomplete                                                             "JavaScript to be executed when ajax completes with success."
     ondblclick                                                             "Client side callback to execute when input element is double clicked."