Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance the select field with null value support #294

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Enhance the select field with null value support #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dfa6c3
Enhance the select field with null value support
ulion Mar 11, 2015
34c9c29
Do not change titleMap order if null value in it.
ulion Mar 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/directives/decorators/bootstrap/select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="form-group {{form.htmlClass}} schema-form-select"
<div ng-if="form.allowAutoNullOption !== undefined" class="form-group {{form.htmlClass}} schema-form-select"
ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false}">
<label class="control-label" ng-show="showTitle()">
{{form.title}}
Expand All @@ -11,6 +11,25 @@
schema-validate="form"
ng-options="item.value as item.name group by item.group for item in form.titleMap"
name="{{form.key.slice(-1)[0]}}">
<option ng-if="form.allowAutoNullOption !== false" value="">{{form.allowAutoNullOption !== true ? form.allowAutoNullOption : ''}}</option>
</select>
<div class="help-block" sf-message="form.description"></div>
</div>
<div ng-if="form.allowAutoNullOption === undefined" class="form-group {{form.htmlClass}} schema-form-select"
ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false}">
<label class="control-label" ng-show="showTitle()">
{{form.title}}
</label>
<select ng-model="$$value$$"
ng-model-options="form.ngModelOptions"
ng-disabled="form.readonly"
sf-changed="form"
class="form-control {{form.fieldHtmlClass}}"
schema-validate="form"
ng-options="item.value as item.name for item in form.titleMap"
name="{{form.key.slice(-1)[0]}}">
</select>
<div class="help-block"
ng-show="(hasError() && errorMessage(schemaError())) || form.description"
ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div>
</div>
13 changes: 13 additions & 0 deletions src/services/schema-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,19 @@ angular.module('schemaForm').provider('schemaForm',
}
}

if (obj.type === 'select' && obj.titleMap) {
// we check whether null value is in titleMap. if so, we fix possible null
// label and set allowAutoNullOption to false, then leave the titleMap as it is
obj.titleMap.forEach(function(item) {
if (item.value === null) {
if (obj.allowAutoNullOption === undefined)
obj.allowAutoNullOption = false;
if (item.name === null)
item.name = '';
}
});
}

// Are we inheriting readonly?
if (readonly === true) { // Inheriting false is not cool.
obj.readonly = true;
Expand Down