Add warning to host wildcard conditions containing some invalid host …

…chars.
FelisCatus · Jan 11, 2015 · 0d99379 · 0d99379
1 parent c2cc042
commit 0d99379
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/omega-web/src/omega/controllers/switch_profile.coffee b/omega-web/src/omega/controllers/switch_profile.coffee
@@ -145,6 +145,12 @@ angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $location,
         return false
     return true
 
+  $scope.conditionHasWarning = (condition) ->
+    if condition.conditionType == 'HostWildcardCondition'
+      pattern = condition.pattern
+      return pattern.indexOf(':') >= 0 || pattern.indexOf('/') >= 0
+    return false
+
   $scope.removeRule = (index) ->
     removeForReal = ->
       $scope.profile.rules.splice index, 1

diff --git a/omega-web/src/partials/profile_switch.jade b/omega-web/src/partials/profile_switch.jade
@@ -38,7 +38,7 @@ div(ng-controller='SwitchProfileCtrl')
             td
               select.form-control(ng-model='rule.condition.conditionType'
                 ng-options='type.type as ("condition_" + type.type | tr) group by (type.group | tr) for type in conditionTypes')
-            td(ng-switch='rule.condition.conditionType')
+            td(ng-switch='rule.condition.conditionType' ng-class='{"has-warning": conditionHasWarning(rule.condition)}')
               span(ng-switch-when='FalseCondition')
                 span(ng-show='!!rule.condition.pattern')
                   input.form-control(ng-model='rule.condition.pattern' disabled title="{{'condition_details_FalseCondition' | tr}}")