Skip to content

Commit ad30a5e

Browse files
committed
fix: PTD items may be deployed into locked namespace
1 parent 391fd88 commit ad30a5e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

cls/SourceControl/Git/Extension.cls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,8 @@ ClassMethod FullExternalName(InternalName As %String) As %String
430430
Method IsReadOnly(InternalName As %String) As %Boolean
431431
{
432432
set settings = ##class(SourceControl.Git.Settings).%New()
433-
quit ##class(SourceControl.Git.Utils).Locked()
433+
quit (##class(SourceControl.Git.Utils).Locked()
434+
&& '$get(^IRIS.Temp("sscProd",$job,"bypassLock")))
434435
|| (##class(SourceControl.Git.Utils).ItemIsProductionToDecompose($get(InternalName))
435436
&& 'settings.decomposeProdAllowIDE
436437
&& '##class(SourceControl.Git.Production).IsEnsPortal())

cls/SourceControl/Git/Utils.cls

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,9 +1400,7 @@ ClassMethod ImportItem(InternalName As %String, force As %Boolean = 0, verbose A
14001400
set sc = ##class(SourceControl.Git.Production).CreateProduction(targetProduction)
14011401
}
14021402
if $$$ISOK(sc) {
1403-
set rollbackFile = ##class(%File).TempFilename()
1404-
set sc = ##class(Ens.Deployment.Deploy).DeployCode(filename,targetProduction,0,rollbackFile)
1405-
do ##class(%File).Delete(rollbackFile)
1403+
set sc = ##class(SourceControl.Git.Production).ImportPTD(filename, targetProduction)
14061404
}
14071405
}
14081406
} elseif ..ItemIsProductionToDecompose(InternalName) {

0 commit comments

Comments
 (0)