Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed May 2, 2022
2 parents 09ad141 + 6505b5c commit 9af9403
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
uses: Ortus-Solutions/setup-commandbox@main
with:
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
version: 5.4.2

- name: Setup Environment Variables For Build Process
id: current_version
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ jobs:
- name: Setup CommandBox CLI
uses: Ortus-Solutions/setup-commandbox@main
with:
version: 5.4.2

- name: Install Dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name":"ColdBox Debugger",
"author":"Ortus Solutions <[email protected]",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/[email protected]@.zip",
"version":"3.3.1",
"version":"3.3.2",
"slug":"cbdebugger",
"type":"modules",
"homepage":"https://github.com/coldbox-modules/cbdebugger",
Expand Down
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

----

## [3.3.2] => 2022-MAY-02

### Fixed

* [CBDEBUGGER-19](https://ortussolutions.atlassian.net/browse/CBDEBUGGER-19) - JSON Form serialization not working on formatting.

----

Expand Down
2 changes: 1 addition & 1 deletion models/DebuggerService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ component
"exception" : {},
"executionTime" : 0,
"endFreeMemory" : 0,
"formData" : ( form ?: {} ),
"formData" : serializeJson( form ?: {} ),
"fullUrl" : arguments.event.getFullUrl(),
"httpHost" : cgi.HTTP_HOST,
"httpReferer" : cgi.HTTP_REFERER,
Expand Down
22 changes: 10 additions & 12 deletions views/main/panels/requestTracker/httpRequestPanel.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,16 @@
</tr>
</cfif>
<!--- Form Params --->
<cfif structCount( args.profiler.formData )>
<tr>
<th width="125" align="right">Form Params:</th>
<td>
<div class="cbd-cellScroller">
<code>
<pre>#jsonFormatter.formatJSON( args.profiler.formData.toString() )#</pre>
</code>
</div>
</td>
</tr>
</cfif>
<tr>
<th width="125" align="right">Form Params:</th>
<td>
<div class="cbd-cellScroller">
<code>
<pre>#jsonFormatter.formatJSON( args.profiler.formData )#</pre>
</code>
</div>
</td>
</tr>
</table>

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

0 comments on commit 9af9403

Please sign in to comment.