Skip to content

Commit 7a7b8c4

Browse files
authored
Merge pull request #247 from intersystems/fix-zpm-getother
Fix unexpected ZPM impact
2 parents 26307da + 3f86c3d commit 7a7b8c4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cls/SourceControl/Git/Utils.cls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ ClassMethod Type(InternalName As %String) As %String
740740
// For an abstract document, use the GetOther() method to try to determine its "real" class
741741
If ##class(%RoutineMgr).UserType(InternalName,.docclass,.doctype) {
742742
// Check for a real abstract document subclass (or GetOther() may not work)
743-
If $classmethod(docclass,"%IsA","%Studio.AbstractDocument") {
743+
If $classmethod(docclass,"%IsA","%Studio.AbstractDocument") && $classmethod(docclass,"%Extends","Ens.Util.AbstractDocument") {
744744
// Grab the actual name
745745
Set actualName = $classmethod(docclass,"GetOther",InternalName)
746746
// The actualName is only valid if we get a single .cls as a result
@@ -1492,7 +1492,7 @@ ClassMethod Name(InternalName As %String, ByRef MappingExists As %Boolean) As %S
14921492
// For an abstract document, use the GetOther() method to try to determine its "real" class
14931493
if usertype,##class(%RoutineMgr).UserType(InternalName,.docclass,.doctype) {
14941494
// Check for a real abstract document subclass (or GetOther() may not work)
1495-
if $classmethod(docclass,"%IsA","%Studio.AbstractDocument") {
1495+
if $classmethod(docclass,"%IsA","%Studio.AbstractDocument") && $classmethod(docclass,"%Extends","Ens.Util.AbstractDocument") {
14961496
// Grab the actual name
14971497
set actualName = $classmethod(docclass,"GetOther",InternalName)
14981498
// The actualName is only valid if we get a single .cls as a result
@@ -1919,3 +1919,4 @@ ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status
19191919
}
19201920

19211921
}
1922+

0 commit comments

Comments
 (0)