Fixes #7207: Select and display agent mode (verify/enforce) #1236
Conversation
| </p> | ||
| } | ||
| private[this] val policyModes = { | ||
| val globalPolicyModeName = configService.rudder_policy_mode_name().getOrElse("") match { |
There was a problem hiding this comment.
globalPolicyMode should be passed as parameter of DirectiveEditForm
There was a problem hiding this comment.
At least somewhere else where you managed a possible error
| } | ||
| private[this] val policyModes = { | ||
| val globalPolicyModeName = configService.rudder_policy_mode_name().getOrElse("") match { | ||
| case Verify => "Audit" |
There was a problem hiding this comment.
You should not rename modes to Audit or Enforce, you should do "policyMode.name.capitalize()"
| case Enforce => "Enforce" | ||
| } | ||
| val policyName = directive.policyMode match { | ||
| case Some(Verify) => "Audit" |
There was a problem hiding this comment.
Same here Should use mode.name
| @@ -427,6 +430,59 @@ class DirectiveEditForm( | |||
| } | |||
| s"${version} ${deprecationInfo}" | |||
| } | |||
| private[this] val globalOverrideText = configService.rudder_policy_overridable().getOrElse("") match { | |||
There was a problem hiding this comment.
Same here: globalPolicyMode should be passed as parameter of DirectiveEditForm
| @@ -98,13 +101,7 @@ class ReportDisplayer( | |||
| def asyncDisplay(node : NodeInfo) : NodeSeq = { | |||
| val id = JsNodeId(node.id) | |||
| val callback = SHtml.ajaxInvoke(() => SetHtml("reportsDetails",displayReports(node)) ) | |||
| Script(OnLoad(JsRaw( | |||
There was a problem hiding this comment.
Why did you remove the tab "behavior" ?
There was a problem hiding this comment.
I think I didn't want to do that, my bad... I will check that.
There was a problem hiding this comment.
I remember now. This code doesn't work since the bind function is deprecated (since Jquery 3.0.0) !
| $(nTd).append(editLink); | ||
| console.log(oData) |
|
|
||
| app.factory('configGlobalFactory', function ($http){ | ||
| //Case : global configuration | ||
| this.policymode = { |
| }); | ||
| } | ||
| }; | ||
| this.overridemode = { |
|
|
||
| app.factory('configNodeFactory', function ($http){ | ||
| //Case : node configuration | ||
| this.policymode = { |
| @@ -273,7 +271,7 @@ function createRuleTable(gridId, data, needCheckbox, needActions, needCompliance | |||
| var tooltipId = data.id+"-description"; | |||
| parent.attr("tooltipid",tooltipId); | |||
| parent.attr("title",""); | |||
| parent.addClass("tooltip tooltipabletr"); | |||
| parent.addClass("tooltip tooltipabletr");{} | |||
| $(nTd).append(editLink); | ||
| var policyMode = oData.policyMode ? oData.policyMode : ""; |
There was a problem hiding this comment.
Maybe you should keep undefined / treat undefined (find it better to deal with than empty String
| var policyName = policyMode == "verify" ? "audit" : policyMode | ||
| var span = "<span class='label-text " + labelType + " glyphicon glyphicon-question-sign' data-toggle='tooltip' data-placement='top' data-html='true' title=''></span>" | ||
| var badge = $(span).get(0); | ||
| var tooltip = "" + |
There was a problem hiding this comment.
I think the tooltip can be put in an external function ( like : 'policyModetooltip (kind, policyName, explanation)'
| var policyMode = currentPolicyMode.toLowerCase(); | ||
| var nodeOrDirective = isNode ? "node" : "directive"; | ||
| var labelType = "label-"+policyMode; | ||
| var policyName = policyMode == "verify" ? "audit" : policyMode |
There was a problem hiding this comment.
You should use policyMode everywhere, not policyName
|
PR updated |
RaphaelGauthier
force-pushed
the
ust_7207/select_and_display_agent_mode_verify_enforce
branch
from
f540106
to
9859b6b
Compare
|
This PR is not mergeable to upper versions. |
|
OK, merging this PR |
https://www.rudder-project.org/redmine/issues/7207