diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-10-14 17:43:16 +0200 |
|---|---|---|
| committer | Vincent Petry <vincent@nextcloud.com> | 2022-10-14 17:43:16 +0200 |
| commit | 331c890e4fa9bd0f9c88a65223b8fc522114d5f0 (patch) | |
| tree | 6ea9ae515c492a2df66aced7473ef0ffef926818 /core | |
| parent | 95d45c20580683a7ed332b2e313ee42b8b728bc7 (diff) | |
| download | nextcloud-server-331c890e4fa9bd0f9c88a65223b8fc522114d5f0.tar.gz nextcloud-server-331c890e4fa9bd0f9c88a65223b8fc522114d5f0.zip | |
Fix regexp for unified searching in apps
Use the correct match for operators.
Prevent the dropdown to close itself when selecting an app to filter by.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/views/UnifiedSearch.vue | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue index 60ef3ef0309..d13ba9114bc 100644 --- a/core/src/views/UnifiedSearch.vue +++ b/core/src/views/UnifiedSearch.vue @@ -78,7 +78,7 @@ :key="type" icon="icon-filter" :title="t('core', 'Search for {name} only', { name: typesMap[type] })" - @click="onClickFilter(`in:${type}`)"> + @click.stop="onClickFilter(`in:${type}`)"> {{ `in:${type}` }} </NcActionButton> </NcActions> @@ -141,7 +141,7 @@ ? t('core', 'Loading more results …') : t('core', 'Load more results')" :icon-class="loading[type] ? 'icon-loading-small' : ''" - @click.prevent="loadMore(type)" + @click.stop="loadMore(type)" @focus="setFocusedIndex" /> </li> </ul> @@ -272,7 +272,7 @@ export default { let match const filters = [] while ((match = regexFilterIn.exec(this.query)) !== null) { - filters.push(match[1]) + filters.push(match[2]) } return filters }, @@ -286,7 +286,7 @@ export default { let match const filters = [] while ((match = regexFilterNot.exec(this.query)) !== null) { - filters.push(match[1]) + filters.push(match[2]) } return filters }, @@ -469,6 +469,13 @@ export default { // Reset search if the query changed await this.resetState() this.triggered = true + + if (!types.length) { + // no results since no types were selected + this.logger.error('No types to search in') + return + } + this.$set(this.loading, 'all', true) this.logger.debug(`Searching ${query} in`, types) |