Browse Source
Merge pull request #3142 from Budibase/scope-or-view
Scope view filters to table always
master
Rory Powell
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap
-
packages/server/src/api/controllers/view/viewBuilder.js
|
|
|
@ -44,7 +44,7 @@ Object { |
|
|
|
exports[`viewBuilder Filter creates a view with multiple filters and conjunctions 1`] = ` |
|
|
|
Object { |
|
|
|
"map": "function (doc) { |
|
|
|
if (doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" && doc[\\"Name\\"] === \\"Test\\" || doc[\\"Yes\\"] > \\"Value\\") { |
|
|
|
if (doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" && (doc[\\"Name\\"] === \\"Test\\" || doc[\\"Yes\\"] > \\"Value\\")) { |
|
|
|
emit(doc[\\"_id\\"], doc[\\"undefined\\"]); |
|
|
|
} |
|
|
|
}", |
|
|
|
|
|
|
|
@ -126,7 +126,7 @@ function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) { |
|
|
|
delete filters[0].conjunction |
|
|
|
} |
|
|
|
const parsedFilters = parseFilterExpression(filters) |
|
|
|
const filterExpression = parsedFilters ? `&& ${parsedFilters}` : "" |
|
|
|
const filterExpression = parsedFilters ? `&& (${parsedFilters})` : "" |
|
|
|
|
|
|
|
const emitExpression = parseEmitExpression(field, groupBy) |
|
|
|
|
|
|
|
|
