projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "RIFT-16172: Project switch does not affect polling and socket pages." into...
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
src
/
src
/
libraries
/
model
/
DescriptorModelMetaProperty.js
diff --git
a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
index
8ba295a
..
8fe51d9
100644
(file)
--- a/
skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
+++ b/
skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
@@
-32,6
+32,9
@@
import DescriptorTemplateFactory from './DescriptorTemplateFactory'
import utils from '../utils'
export default {
import utils from '../utils'
export default {
+ isBoolean(property = {}) {
+ return (typeof(property['data-type']) == 'string') && (property['data-type'].toLowerCase() == 'boolean')
+ },
isLeaf(property = {}) {
return /leaf|choice/.test(property.type);
},
isLeaf(property = {}) {
return /leaf|choice/.test(property.type);
},
@@
-66,7
+69,7
@@
export default {
return !/^(leaf|leaf_list)$/.test(property.type);
},
isSimpleList(property = {}) {
return !/^(leaf|leaf_list)$/.test(property.type);
},
isSimpleList(property = {}) {
- return _.
contain
s(DescriptorModelFields.simpleList, property.name);
+ return _.
include
s(DescriptorModelFields.simpleList, property.name);
},
isPrimativeDataType(property = {}) {
const Property = this;
},
isPrimativeDataType(property = {}) {
const Property = this;
@@
-152,7
+155,7
@@
export default {
if (uiState.name === 'name') {
return changeCase.param(parentMeta.name) + '-' + InstanceCounter.count(parentMeta[':qualified-type']);
}
if (uiState.name === 'name') {
return changeCase.param(parentMeta.name) + '-' + InstanceCounter.count(parentMeta[':qualified-type']);
}
- if (_.isArray(parentMeta.key) && _.
contain
s(parentMeta.key, uiState.name)) {
+ if (_.isArray(parentMeta.key) && _.
include
s(parentMeta.key, uiState.name)) {
if (/uuid/.test(uiState['data-type'])) {
return guid();
}
if (/uuid/.test(uiState['data-type'])) {
return guid();
}