Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
jclausen committed Feb 21, 2025
2 parents 97b152e + a15bda5 commit 137c24c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"stachebox",
"version":"2.1.1",
"version":"2.1.2",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/stachebox/@build.version@/stachebox-@build.version@+@build.number@.zip",
"author":"Jon Clausen <jclausen@ortussolutions.com",
"homepage":"https://github.com/coldbox-modules/stachebox",
Expand Down
3 changes: 2 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ 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).

----
## [Unreleased]

## [2.1.1] - 2024-12-14
## [2.1.1] - 2025-02-20

### Fixed

Expand Down
19 changes: 16 additions & 3 deletions resources/assets/js/components/entries/DefaultEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@
:displayApplication="false"
:allowFilters="true"
:allowSuppress="false"
:applySearch="false"
></entry-list>
</tab>

Expand Down Expand Up @@ -328,12 +329,24 @@ export default {
},
computed : {
occurrenceParams : function(){
return this.occurrenceParams = {
let params = {
"stachebox.signature" : this.entry.stachebox.signature,
exclude : this.entry.id,
sortOrder : "@timestamp DESC",
search: this.$route.params.search
sortOrder : "@timestamp DESC"
};
let searchParams = {};
if( this.$route.params.search ){
try{
searchParams = JSON.parse( window.atob( this.$route.params.search ) );
} catch( e ) {}
}
delete searchParams.collapse;
delete searchParams.sortOrder;
Object.assign( params, searchParams );
return params;
},
traceParams(){
return this.entry[ 'trace.id' ] ? { "trace.id" : this.entry[ 'trace.id' ] } : {};
Expand Down

0 comments on commit 137c24c

Please # to comment.