Skip to content

[DD-3320] Add option for adding numeric name #302

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

Open
wants to merge 4 commits into
base: dd
Choose a base branch
from
Open

[DD-3320] Add option for adding numeric name #302

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a5b1cf
[DD-3320] Validate number only names when adding new item
Mar 12, 2018
60e41d6
[DD-3320] Update code format and validation
Mar 15, 2018
dbf7005
[DD-3320] Change to single quotes
Mar 15, 2018
b9ad9e0
[DD-3320] Change to strict equality
Mar 15, 2018
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
17 changes: 12 additions & 5 deletions client/common/directives/ModelFieldReference/ModelFieldReference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ angular.module('dashboard.directives.ModelFieldReference', [
};
})

.directive('modelFieldReferenceEdit', function($compile, $cookies, Config, GeneralModelService) {
.directive('modelFieldReferenceEdit', function($compile, $cookies, Config, GeneralModelService, AlertModalService) {
function getTemplate(multiple, matchTemplate, choiceTemplate) {
var template = '';
if (multiple) {
Expand Down Expand Up @@ -284,12 +284,19 @@ angular.module('dashboard.directives.ModelFieldReference', [
//emit an event when an item is selected
scope.$emit('onModelFieldReferenceSelect', scope.modelData, scope.key, item);
var textValue = item[scope.options.searchField];
if (item && item[scope.options.searchField] == "[Add New Item]") {
if (item && item[scope.options.searchField] === '[Add New Item]') {
//console.log("should add " + $select.search);
var value = element.find("input.ui-select-search").val().trim();
if (value.length === 0) {
var numRegex = new RegExp('^[0-9]+$');
var value = element.find('input.ui-select-search').val().trim();
var isNewItemInvalid = typeof scope.options.allowNumericName !== 'undefined' && !scope.options.allowNumericName && numRegex.test(value) ? true : false;
if (!value.length || isNewItemInvalid) {
scope.data = null;
textValue = "";
textValue = '';
if (isNewItemInvalid) {
scope.selected.item = {};
scope.modelData = {};
AlertModalService.show('Please enter a valid ' + (scope.property.display.label || 'name') + '.');
}
} else {
scope.data = value;
var newItem = {};
Expand Down