From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Mon, 27 Feb 2017 18:43:34 +0000 (-0500)
Subject: Merge branch 'master' of https://osm.etsi.org/gerrit/osm/UI
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=f1415f5a842a1243160ba1f7c549a47cabf0d11d;hp=-c;p=osm%2FUI.git

Merge branch 'master' of https://osm.etsi.org/gerrit/osm/UI
---

f1415f5a842a1243160ba1f7c549a47cabf0d11d
diff --combined skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
index 8a67c9671,50a3585d5..31b1ed631
--- a/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
+++ b/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
@@@ -144,10 -144,10 +144,10 @@@ export default class RecordCard extend
                    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'}}>{v.constructor.name != 'Object' ? v : buildProperties(v)}</div>
+                         <div style={{margin: '0 0.5rem'}}>{v.constructor.name == 'String' ? v : buildProperties(v)}</div>
                        </div>
                      )
                    });
@@@ -329,7 -329,7 +329,7 @@@
            if (this.props.type == 'nsr') {
              primitivesTabTitle = 'Service Primitive';
            } else if (this.props.type == 'vnfr') {
 -            primitivesTabTitle = 'Service Primitive'
 +            primitivesTabTitle = 'Config Primitive'
            }
  
            tabList.push(