tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-08 13:38:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add warning to host wildcard conditions containing some invalid host chars.

Browse Source
This commit is contained in:
FelisCatus 2015-01-11 12:49:14 +08:00
parent c2cc042de4
commit 0d9937963a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
omega-web/src/omega/controllers/switch_profile.coffee
View File

@ -145,6 +145,12 @@ angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $location,
return false return false
return true return true
$scope.conditionHasWarning = (condition) ->
if condition.conditionType == 'HostWildcardCondition'
pattern = condition.pattern
return pattern.indexOf(':') >= 0 || pattern.indexOf('/') >= 0
return false
$scope.removeRule = (index) -> $scope.removeRule = (index) ->
removeForReal = -> removeForReal = ->
$scope.profile.rules.splice index, 1 $scope.profile.rules.splice index, 1

2
omega-web/src/partials/profile_switch.jade
View File

@ -38,7 +38,7 @@ div(ng-controller='SwitchProfileCtrl')
td td
select.form-control(ng-model='rule.condition.conditionType' 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') 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-switch-when='FalseCondition')
span(ng-show='!!rule.condition.pattern') span(ng-show='!!rule.condition.pattern')
input.form-control(ng-model='rule.condition.pattern' disabled title="{{'condition_details_FalseCondition' | tr}}") input.form-control(ng-model='rule.condition.pattern' disabled title="{{'condition_details_FalseCondition' | tr}}")