Skip to content

Commit bdbf0ea

Browse files
committed
Merge branch 'main' into improve-charts
2 parents 0203d6b + cad7bcd commit bdbf0ea

File tree

66 files changed

+374
-360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+374
-360
lines changed

docs/guide/link-to.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ Set a filter and its value; for the filter, you can either pass its custom key o
118118

119119
Set a default sort.
120120

121+
### `withGlobalFilterValues(array|string $globalFilterValues)`
122+
123+
Set a global filter value(s). Ex: `LinkToShowPage::make(...)->withGlobalFilterValues($tenant->id)->renderAsUrl()`.
124+
121125
### `setFullQuerystring(array $querystring)`
122126

123127
`LinkToEntityList` only

docs/guide/testing-with-sharp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ it('allows the user to display a leaf form', function () {
118118
});
119119
```
120120

121-
#### `withSharpGlobalFilterKeys(array|string $filterKeys): self`
121+
#### `withSharpGlobalFilterValues(array|string $filterValues): self`
122122

123-
You can specify the global filter keys to use in the Sharp context.
123+
You can specify the global filter values to use in the Sharp context.
124124

125125
```php
126126
it('allows the user to display a leaf form', function () {
@@ -129,7 +129,7 @@ it('allows the user to display a leaf form', function () {
129129

130130
$this
131131
->loginAsSharpUser($user)
132-
->withSharpGlobalFilterKeys($tenant->key)
132+
->withSharpGlobalFilterValues($tenant->id)
133133
->getSharpForm(LeafEntity::class, 16)
134134
->assertOk();
135135
});

resources/js/filters/components/filters/SelectFilter.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,8 @@
7979
:multiple="props.filter.multiple"
8080
highlight-on-hover
8181
>
82-
<template v-if="filter.searchable">
83-
<!-- v-show because otherwise highlight on hover does not work -->
84-
<CommandInput :placeholder="__('sharp::form.multiselect.placeholder')" />
85-
</template>
82+
<!-- v-show because otherwise highlight on hover does not work -->
83+
<CommandInput v-show="filter.searchable" :placeholder="__('sharp::form.multiselect.placeholder')" />
8684

8785
<CommandList class="scroll-pb-12">
8886
<CommandEmpty>{{ __('sharp::form.autocomplete.no_results_text') }}</CommandEmpty>

0 commit comments

Comments
 (0)