Skip to content

Commit

Permalink
Merge branch 'branches/rudder/4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Normation GIT merger committed Oct 24, 2017
2 parents c4750d5 + 15890ce commit 9d9071a
Showing 1 changed file with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ class DirectiveEditForm(
}
}
}

val parametersHtml = if(directive.parameters.size > 0){
parameterEditor.toFormNodeSeq
}else{
<div class="alert alert-info">This Technique has no configurable parameters.</div>
}
val rules = roRuleRepo.getAll(false).getOrElse(Seq()).toList
val rootCategory = roRuleCategoryRepo.getRootCategory.getOrElse(throw new RuntimeException("Error when retrieving the rule root category - it is most likelly a bug. Pleae report."))
val directiveApp = new DirectiveApplicationManagement(directive,rules,rootCategory)
Expand Down Expand Up @@ -291,7 +295,7 @@ class DirectiveEditForm(
"#policyModes" #> policyModes.toForm_! &
"#version" #> versionSelect.toForm_! &
"#version *+" #> migrateButton(directiveVersion.get,"Migrate") &
"#parameters" #> parameterEditor.toFormNodeSeq &
"#parameters" #> parametersHtml &
"#directiveRulesTab *" #> ruleDisplayer &
"#save" #> { SHtml.ajaxSubmit("Save", onSubmitSave _) % ("id" -> htmlId_save) % ("class","btn btn-success") } &
"#notifications *" #> updateAndDisplayNotifications() &
Expand Down

0 comments on commit 9d9071a

Please sign in to comment.