From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Mon, 27 Feb 2017 18:45:44 +0000 (+0100)
Subject: Merge "RIFT-15669: Launchpad UI - RIFT.ware DEB install - Viewport - service primitiv... 
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=4acb70df4b726b59822ea1c9296fce9a717f0b7c;hp=-c

Merge "RIFT-15669: Launchpad UI - RIFT.ware DEB install - Viewport - service primitive tab for ping_vnfd"
---

4acb70df4b726b59822ea1c9296fce9a717f0b7c
diff --combined skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
index 50a3585d5,8a67c9671..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(