fix tree views (to GUI, to file) of XBRL concept names to ignore

preferred labels in pre LB
Arelle · Jun 18, 2015 · 36325b0 · 36325b0
1 parent 5c03446
commit 36325b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/arelle/ViewFileRelationshipSet.py b/arelle/ViewFileRelationshipSet.py
@@ -7,6 +7,8 @@
 from arelle import ModelObject, ModelDtsObject, XbrlConst, XmlUtil, ViewFile
 from arelle.ModelDtsObject import ModelRelationship
 from arelle.ViewUtil import viewReferences
+from arelle.XbrlConst import conceptNameLabelRole
+
 import os
 
 def viewRelationshipSet(modelXbrl, outfile, header, arcrole, linkrole=None, linkqname=None, arcqname=None, labelrole=None, lang=None):
@@ -178,7 +180,10 @@ def viewConcept(self, concept, modelObject, labelPrefix, preferredLabel, indent,
                     toConcept = modelRel.toModelObject
                     if toConcept in visited:
                         childPrefix += "(loop) "
-                    self.viewConcept(toConcept, modelRel, childPrefix, (modelRel.preferredLabel or self.labelrole), indent + 1, arcrole, nestedRelationshipSet, visited)
+                    labelrole = modelRel.preferredLabel
+                    if not labelrole or self.labelrole == conceptNameLabelRole: 
+                        labelrole = self.labelrole
+                    self.viewConcept(toConcept, modelRel, childPrefix, labelrole, indent + 1, arcrole, nestedRelationshipSet, visited)
                 visited.remove(concept)
         except AttributeError: #  bad relationship
             return
diff --git a/arelle/ViewWinRelationshipSet.py b/arelle/ViewWinRelationshipSet.py
@@ -11,6 +11,7 @@
 from arelle.ModelDtsObject import ModelRelationship
 from arelle.ModelFormulaObject import ModelFilter
 from arelle.ViewUtil import viewReferences, groupRelationshipSet, groupRelationshipLabel
+from arelle.XbrlConst import conceptNameLabelRole
 
 def viewRelationshipSet(modelXbrl, tabWin, arcrole, 
                         linkrole=None, linkqname=None, arcqname=None, lang=None, 
@@ -294,7 +295,8 @@ def viewConcept(self, concept, modelObject, labelPrefix, preferredLabel, parentn
                     if toConcept in visited:
                         childPrefix += "(loop)"
                     labelrole = modelRel.preferredLabel
-                    if not labelrole: labelrole = self.labelrole
+                    if not labelrole or self.labelrole == conceptNameLabelRole: 
+                        labelrole = self.labelrole
                     n += 1 # child has opposite row style of parent
                     self.viewConcept(toConcept, modelRel, childPrefix, labelrole, childnode, n, nestedRelationshipSet, visited)
                 visited.remove(concept)