Merge branch 'branches/rudder/2.11'

Normation · Oct 9, 2014 · 71d0589 · 71d0589
2 parents a25927b + a3235d6
commit 71d0589
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
@@ -296,13 +296,8 @@ class SearchNodeComponent(
    * @return
    */
   def ajaxGridRefresh() : JsCmd = {
-
-      val grid = gridResult
-      JE.JsRaw("""$("#serverGrid_info").remove();""") &
-      JE.JsRaw("""$("#serverGrid_length").remove();""") &
-      activateButtonOnChange &
-       grid
-
+    activateButtonOnChange &
+    gridResult
   }
 
 

diff --git a/rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js b/rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js
@@ -231,10 +231,7 @@ function createRuleTable (gridId, data, needCheckbox, isPopup, allCheckboxCallba
         , "sSearch": ""
       }
     , "fnStateLoadParams": function (oSettings, oData) {
-        if(oData.oSearch) {
-          oData.oSearch.sSearch = "";
-        }
-        return false;
+        oData.aoSearchCols[1].sSearch = "";
       }
     , "aaSorting": [[ sortingDefault, "asc" ]]
     , "sDom": '<"dataTables_wrapper_top newFilter"f<"dataTables_refresh">>rt<"dataTables_wrapper_bottom"lip>'

diff --git a/rudder-web/src/main/webapp/style/rudder.css b/rudder-web/src/main/webapp/style/rudder.css
@@ -592,6 +592,7 @@ div#Detail {
 .dataTables_length select {
   padding: 1px;
   border: 1px solid #B4B3A8;
+  width: auto;
 }
 
 .dataTables_length {
@@ -2833,4 +2834,4 @@ li.targetExcluded a{
 
 .simplemodal-wrap{
 	overflow:auto !important
-}
+}