Fixes #8763: When the conditions contain spaces, there are kept and the generated file is invalid #429
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VinceMacBuche
requested changes
Sep 15, 2016
| @@ -257,7 +258,7 @@ <h4 class="panel-title"> | |||
| <span class="glyphicon glyphicon-plus-sign" style="margin-right:5px"></span> | |||
| Add methods | |||
| </div> | |||
| <button ng-disabled="editForm.$pending || editForm.$invalid || CForm.form.$invalid || checkSelectedTechnique()" class="btn btn-default pull-right" ng-click="saveTechnique()">Save</button> | |||
| <button ng-disabled="editForm.$pending || editForm.$invalid || CForm.form.$invalid || checkSelectedTechnique() || selectedMethod.advanced_class.indexOf(' ')>0 || CForm.versionForm.$invalid" class="btn btn-default pull-right" ng-click="saveTechnique()">Save</button> | |||
There was a problem hiding this comment.
YOu should not add the check on wetherit contains a space or not, but be based on the fact that Cform.form is $invalid (check advanced class input with a patter)
| <input type="text" name="cfClasses" id="advanced" class="form-control" ng-change="updateClassContext()" ng-model="selectedMethod.advanced_class" placeholder=""> | ||
| <div class="form-group condition-form" ng-class="{'has-error':selectedMethod.advanced_class.indexOf(' ')>0}"> | ||
| <label class="control-label" for="advanced">Other CFEngine classes:</label> | ||
| <input type="text" class="form-control" name="cfClasses" id="advanced" aria-describedby="helpBlock" ng-change="updateClassContext()" ng-model="selectedMethod.advanced_class" > |
There was a problem hiding this comment.
You should add a ng-pattern here to check the input ( value should be ng-pattern="/^\S+$/" ) and then you can use angular form validation
| <div class="form-group condition-form"> | ||
| <label for="advanced">Other CFEngine classes:</label> | ||
| <input type="text" name="cfClasses" id="advanced" class="form-control" ng-change="updateClassContext()" ng-model="selectedMethod.advanced_class" placeholder=""> | ||
| <div class="form-group condition-form" ng-class="{'has-error':selectedMethod.advanced_class.indexOf(' ')>0}"> |
There was a problem hiding this comment.
With angular validation you don't need to have the ng-class
| <div class="form-group condition-form" ng-class="{'has-error':selectedMethod.advanced_class.indexOf(' ')>0}"> | ||
| <label class="control-label" for="advanced">Other CFEngine classes:</label> | ||
| <input type="text" class="form-control" name="cfClasses" id="advanced" aria-describedby="helpBlock" ng-change="updateClassContext()" ng-model="selectedMethod.advanced_class" > | ||
| <span id="helpBlock" class="help-block" ng-show="selectedMethod.advanced_class.indexOf(' ')>0"> |
There was a problem hiding this comment.
And you use a ng-message here
…he generated file is invalid
RaphaelGauthier
force-pushed
the
bug_8763/when_the_conditions_contain_spaces_there_are_kept_and_the_generated_file_is_invalid
branch
from
5a52f4b
to
8e39272
Compare
|
PR updated |
VinceMacBuche
approved these changes
Sep 21, 2016
|
OK, merging this PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/8763