Fixes #6260: Cannot apply a Directive to all visible Rules

Normation · Feb 12, 2015 · afc63e8 · afc63e8
1 parent 99022da
commit afc63e8
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
@@ -294,13 +294,13 @@ class RuleGrid(
     directiveApplication match {
       case Some(directiveApp) =>
         def moveCategory(arg: String) : JsCmd = {
-        //parse arg, which have to  be json object with sourceGroupId, destCatId
+          //parse arg, which have to  be json object with sourceGroupId, destCatId
           try {
             (for {
                JObject(JField("rules",JArray(childs)) :: Nil) <- JsonParser.parse(arg)
-               JString(ruleid) <- childs
+               JString(ruleId) <- childs
              } yield {
-               RuleId(ruleid)
+               RuleId(ruleId)
              }) match {
               case ruleIds =>
                 directiveApp.checkRules(ruleIds,status)  match {
@@ -314,12 +314,18 @@ class RuleGrid(
             }
             }
           } catch {
-            case e:Exception => Alert("Error while trying to move group :"+e)
+            case e:Exception =>
+              val msg = s"Error while trying to apply directive ${directiveApp.directive.id.value} on visible Rules"
+              logger.error(s"$msg, cause is: ${e.getMessage()}")
+              logger.debug(s"Error details:")
+              e.getStackTrace().foreach(st => logger.debug(st))
+              Alert(s"Error while trying to apply directive ${directiveApp.directive.id.value} on visible Rules")
           }
         }
 
         JsRaw(s"""
-            var rules = $$.map($$('#grid_rules_grid_zone tr.tooltipabletr'), function(v,i) {return $$(v).prop("id")});
+            var data = $$("#${htmlId_rulesGridId}").dataTable()._('tr', {"filter":"applied", "page":"current"});
+            var rules = $$.map(data, function(e,i) { return e.id })
             var rulesIds = JSON.stringify({ "rules" : rules });
             ${SHtml.ajaxCall(JsVar("rulesIds"), moveCategory _)};
         """)
@@ -768,16 +774,13 @@ case class RuleLine (
 
       val optFields : Seq[(String,JsExp)]= reasonField.toSeq ++ cbCallbackField ++ callbackField
 
-     // val changes = NodeChanges.changesOnRule(id)(recentChanges)
-
       val base = JsObj(
           ( "name", name )
         , ( "id", id.value )
         , ( "description", description )
         , ( "applying",  applying )
         , ( "category", category )
         , ( "status", status )
-     //   , ( "recentChanges", NodeChanges.json(changes) )
         , ( "trClass", trClass )
       )