projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://osm.etsi.org/gerrit/osm/UI
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
src
/
recordViewer
/
recordCard.jsx
diff --git
a/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
b/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
index
88ff709
..
31b1ed6
100644
(file)
--- a/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
+++ b/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
@@
-144,10
+144,10
@@
export default class RecordCard extends React.Component {
let p = [];
_.forEach(obj, function(v, k) {
p.push(
let p = [];
_.forEach(obj, function(v, k) {
p.push(
- <div style={{margin: '0.5rem 0.5rem'}} key={k + vi}>
+ <div style={{margin: '0.5rem 0.5rem'}} key={k +
'-' +
vi}>
<div style={{margin: '0 0.5rem',
fontWeight: 'bold', textTransform: 'uppercase', color: '#5b5b5b'}}>{k}</div>
<div style={{margin: '0 0.5rem',
fontWeight: 'bold', textTransform: 'uppercase', color: '#5b5b5b'}}>{k}</div>
- <div style={{margin: '0 0.5rem'}}>{v.constructor.name
!= 'Object
' ? v : buildProperties(v)}</div>
+ <div style={{margin: '0 0.5rem'}}>{v.constructor.name
== 'String
' ? v : buildProperties(v)}</div>
</div>
)
});
</div>
)
});
@@
-266,7
+266,7
@@
export default class RecordCard extends React.Component {
if(this.props.isLoading) {
html = <DashboardCard className="loading" showHeader={true} title={cardData["short-name"]}><LoadingIndicator size={10} show={true} /></DashboardCard>
} else {
if(this.props.isLoading) {
html = <DashboardCard className="loading" showHeader={true} title={cardData["short-name"]}><LoadingIndicator size={10} show={true} /></DashboardCard>
} else {
- let glyphValue = (
this.props.mmm
recordDetailsToggleValue) ? "chevron-left" : "chevron-right";
+ let glyphValue = (
!this.props.
recordDetailsToggleValue) ? "chevron-left" : "chevron-right";
if (this.props.type == 'nsr') {
tabList.push(
if (this.props.type == 'nsr') {
tabList.push(
@@
-329,7
+329,7
@@
export default class RecordCard extends React.Component {
if (this.props.type == 'nsr') {
primitivesTabTitle = 'Service Primitive';
} else if (this.props.type == 'vnfr') {
if (this.props.type == 'nsr') {
primitivesTabTitle = 'Service Primitive';
} else if (this.props.type == 'vnfr') {
- primitivesTabTitle = '
Service
Primitive'
+ primitivesTabTitle = '
Config
Primitive'
}
tabList.push(
}
tabList.push(