Skip to content

Commit 2279afd

Browse files
committed
now not checking sql privileges and properly gets files from other user
1 parent 59aff2d commit 2279afd

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

cls/SourceControl/Git/Change.cls

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,24 @@ ClassMethod GetOtherDeveloperChanges() As %Boolean
8383
{
8484
set numEntries = 0
8585
set fileToOtherDevelopers = {}
86-
set query = "Select ItemFile, ChangedBy FROM SourceControl_Git.Change WHERE CHARINDEX('SourceControl.Git', Name)>0 AND Committed = '0' AND ChangedBy <> ?"
86+
set query = "Select ItemFile, ChangedBy FROM SourceControl_Git.Change WHERE Committed = '0' AND ChangedBy <> ?"
8787
set statement = ##class(%SQL.Statement).%New()
88-
set status = statement.%Prepare(query)
88+
set status = statement.%Prepare(query, 0)
8989
$$$ThrowOnError(status)
9090
set rset = statement.%Execute($username)
9191
if (rset.%SQLCODE < 0) {
9292
throw ##class(%Exception.SQL).CreateFromSQLCODE(rset.%SQLCODE,rset.%Message)
9393
}
94+
set tempFolder = ##class(SourceControl.Git.Utils).TempFolder()
9495
while rset.%Next(.sc) {
9596
$$$ThrowOnError(sc)
96-
set filePath = "cls\"_$EXTRACT(rset.ItemFile, $FIND(rset.ItemFile,"cls\"),$LENGTH(rset.ItemFile))
97+
98+
if $FIND(rset.ItemFile, tempFolder) {
99+
set filePath = $PIECE(rset.ItemFile, tempFolder, 2)
100+
} else {
101+
continue
102+
}
103+
97104
set otherDevelopers = fileToOtherDevelopers.%Get(filePath, [])
98105
do otherDevelopers.%Push(rset.ChangedBy)
99106
do fileToOtherDevelopers.%Set(filePath, otherDevelopers)

0 commit comments

Comments
 (0)