Skip to content

Commit 9af9403

Browse files
committed
Merge branch 'development'
2 parents 09ad141 + 6505b5c commit 9af9403

File tree

6 files changed

+22
-14
lines changed

6 files changed

+22
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
uses: Ortus-Solutions/setup-commandbox@main
4848
with:
4949
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
50+
version: 5.4.2
5051

5152
- name: Setup Environment Variables For Build Process
5253
id: current_version

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ jobs:
5151
5252
- name: Setup CommandBox CLI
5353
uses: Ortus-Solutions/setup-commandbox@main
54+
with:
55+
version: 5.4.2
5456

5557
- name: Install Dependencies
5658
run: |

box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"ColdBox Debugger",
33
"author":"Ortus Solutions <[email protected]",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/[email protected]@.zip",
5-
"version":"3.3.1",
5+
"version":"3.3.2",
66
"slug":"cbdebugger",
77
"type":"modules",
88
"homepage":"https://github.com/coldbox-modules/cbdebugger",

changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
----
9+
10+
## [3.3.2] => 2022-MAY-02
11+
12+
### Fixed
13+
14+
* [CBDEBUGGER-19](https://ortussolutions.atlassian.net/browse/CBDEBUGGER-19) - JSON Form serialization not working on formatting.
815

916
----
1017

models/DebuggerService.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ component
191191
"exception" : {},
192192
"executionTime" : 0,
193193
"endFreeMemory" : 0,
194-
"formData" : ( form ?: {} ),
194+
"formData" : serializeJson( form ?: {} ),
195195
"fullUrl" : arguments.event.getFullUrl(),
196196
"httpHost" : cgi.HTTP_HOST,
197197
"httpReferer" : cgi.HTTP_REFERER,

views/main/panels/requestTracker/httpRequestPanel.cfm

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,16 @@
100100
</tr>
101101
</cfif>
102102
<!--- Form Params --->
103-
<cfif structCount( args.profiler.formData )>
104-
<tr>
105-
<th width="125" align="right">Form Params:</th>
106-
<td>
107-
<div class="cbd-cellScroller">
108-
<code>
109-
<pre>#jsonFormatter.formatJSON( args.profiler.formData.toString() )#</pre>
110-
</code>
111-
</div>
112-
</td>
113-
</tr>
114-
</cfif>
103+
<tr>
104+
<th width="125" align="right">Form Params:</th>
105+
<td>
106+
<div class="cbd-cellScroller">
107+
<code>
108+
<pre>#jsonFormatter.formatJSON( args.profiler.formData )#</pre>
109+
</code>
110+
</div>
111+
</td>
112+
</tr>
115113
</table>
116114

117115
<cfset headerKeys = args.profiler.requestData.headers.keyArray()>

0 commit comments

Comments
 (0)