Merge branch 'master' into prototype/windows-dsc

Normation · Jun 19, 2017 · 2d50757 · 2d50757
2 parents 1196033 + ecb10c4
commit 2d50757
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/rudder-core/src/main/scala/com/normation/rudder/services/workflows/WorkflowService.scala b/rudder-core/src/main/scala/com/normation/rudder/services/workflows/WorkflowService.scala
@@ -279,6 +279,9 @@ class TwoValidationStepsWorkflowServiceImpl(
         WorkflowAction("Deploy",actions)
       case Deployed.id   => NoWorkflowAction
       case Cancelled.id  => NoWorkflowAction
+      case WorkflowNodeId(x) =>
+        logger.warn(s"An unknow workflow state was reached with ID: '${x}'. It is likely to be a bug, please report it")
+        NoWorkflowAction
     }
   }
 
@@ -297,6 +300,9 @@ class TwoValidationStepsWorkflowServiceImpl(
       case Deployment.id => if (authorizedRoles.contains("deployer") && canDeploy)  Seq((Cancelled.id,stepDeploymentToCancelled _)) else Seq()
       case Deployed.id   => Seq()
       case Cancelled.id  => Seq()
+      case WorkflowNodeId(x) =>
+        logger.warn(s"An unknow workflow state was reached with ID: '${x}'. It is likely to be a bug, please report it")
+        Seq()
     }
   }
 
@@ -307,6 +313,9 @@ class TwoValidationStepsWorkflowServiceImpl(
       case Deployment.id => authorizedRoles.contains("deployer")
       case Deployed.id   => false
       case Cancelled.id  => false
+      case WorkflowNodeId(x) =>
+        logger.warn(s"An unknow workflow state was reached with ID: '${x}'. It is likely to be a bug, please report it")
+        false
     }
   }
 
@@ -316,6 +325,9 @@ class TwoValidationStepsWorkflowServiceImpl(
       case Deployment.id => true
       case Deployed.id   => false
       case Cancelled.id  => false
+      case WorkflowNodeId(x) =>
+        logger.warn(s"An unknow workflow state was reached with ID: '${x}'. It is likely to be a bug, please report it")
+        false
     }
   }
   def findStep(changeRequestId: ChangeRequestId) : Box[WorkflowNodeId] = {

diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
@@ -334,7 +334,6 @@ object DisplayDirectiveTree extends Loggable {
         }
       }
     }
-
     S.appendJs(JsRaw(s"""
       var scopeElmnt = '#directiveFilter';
       if(!angular.element(scopeElmnt).scope()){
@@ -344,7 +343,6 @@ object DisplayDirectiveTree extends Loggable {
       $$('#showFiltersDirective').on('click', function () {
         setTimeout(function(){adjustHeight('#activeTechniquesTree');}, 550);
       });
-      $$('#activeTechniquesTree').on('scroll',function(){$$('.tooltip').hide();});
       $$(".bsTooltip").bsTooltip({container: "${if(addEditLink){"#editRuleZonePortlet"}else{"#boxDirectiveTree"}}"})
     """))
     directiveLib.subCategories.filterNot(_.isSystem).sortBy( _.name ).flatMap { cat => displayCategory(cat, cat.id.value).toXml }

diff --git a/...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala b/...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
@@ -222,6 +222,11 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
         }
 
         buildDirectiveTree('#${htmlId_activeTechniquesTree}', [ directiveId ], '${S.contextPath}', 1);
+        $$(window).on('resize',function(){
+          adjustHeight('#activeTechniquesTree');
+        });
+        adjustHeight('#activeTechniquesTree');
+        $$('#activeTechniquesTree').on('scroll',function(){$$('.tooltip').hide();});
         createTooltip();
     """)
   }

diff --git a/rudder-web/src/main/webapp/style/rudder/rudder-bootstrap.css b/rudder-web/src/main/webapp/style/rudder/rudder-bootstrap.css
@@ -222,13 +222,12 @@
   text-align: center;
   background-color: white;
   position: fixed;
-  bottom: 50px;
+  bottom: 55px;
   padding-top: 10px;
   border-left-width: 0px;
   margin-left: 0px;
   padding-bottom: 10px;
   border-top:5px #DDDDDD solid;
-  border-right:5px #DDDDDD solid;
   margin-left:-15px;
   padding-left:15px;
   padding-right:15px;
@@ -237,7 +236,7 @@
 }
 
 .directive-footer{
-  width:65.8%
+  width:68%
 }
 
 .rule-footer{