Non-DNA glyph should take precedence even when there is a role

Author: cjmyers

lib/getDisplayList.js

@@ -8,7 +8,7 @@ var URI = require('sboljs').URI
 var sha1 = require('sha1');
 
 function getDisplayList(componentDefinition, config, share, max) {
-    console.log("componentDefinition", componentDefinition);
+
     var segments = [
         getDisplayListSegment(componentDefinition, config, share)
     ]
@@ -160,14 +160,15 @@ function getDisplayListSegment(componentDefinition, config, share) {
 
             var glyphType = soToGlyphType(soCode)
 
+	    if (!nonDNAType) {
+		if (glyphType) {
+                    glyph = glyphType;
+		}
 
-            if (glyphType) {
-                glyph = glyphType;
-            }
-
-            else {
-              glyph = 'no-glyph-assigned';
-            }
+		else {
+		    glyph = 'no-glyph-assigned';
+		}
+	    }
         })
 
         return {