Skip to content

Commit 5eeec05

Browse files
committed
update MasterDetailToJson()
1 parent 55da219 commit 5eeec05

7 files changed

Lines changed: 4 additions & 5 deletions

File tree

JSONFox.PJT

0 Bytes
Binary file not shown.

JSONFox.pjx

0 Bytes
Binary file not shown.

jsonfox.app

7 Bytes
Binary file not shown.

src/cursortojsonobject.prg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ define class CursorToJsonObject as session
4141
lnRecno = Recno()
4242
Scan
4343
Scatter memo name loRow
44+
laDetail = .null.
4445
* Filter detail
4546
lcCursor = Sys(2015)
4647
try

src/frmjsonviewer.scx

0 Bytes
Binary file not shown.

src/jsonclass.prg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ define class JSONClass as session
44
LastErrorText = ""
55
lError = .f.
66
lShowErrors = .t.
7-
version = "9.24"
7+
version = "9.25"
88
hidden lInternal
99
hidden lTablePrompt
1010
Dimension aCustomArray[1]
@@ -320,7 +320,7 @@ define class JSONClass as session
320320

321321
Function MasterDetailToJSON(tcMaster as String, tcDetail as String, tcExpr as String, tcDetailAttribute as String, tnSessionID as Integer)
322322
local loClass, loResult, lcResult
323-
try
323+
Try
324324
this.ResetError()
325325
tnSessionID = evl(tnSessionID, set("Datasession"))
326326
set datasession to tnSessionID

src/loader.prg

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@ Endif
4242
If Type("_Screen.Toml") != "U"
4343
=Removeproperty(_Screen, 'Toml')
4444
Endif
45-
=AddProperty(_Screen, "Toml", Createobject("TomlClass"))
46-
47-
Return
45+
=AddProperty(_Screen, "Toml", Createobject("TomlClass"))

0 commit comments

Comments
 (0)