Skip to content

Fix: filter tab not working for _User, and ohter classes starting with _ #1275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 10, 2019
Merged

Fix: filter tab not working for _User, and ohter classes starting with _ #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ec2f29
Fix: filter tab not working for _User, and ohter classes starting with _
davimacedo Sep 7, 2019
6b9cf6f
Merge branch 'master' into fix1271
davimacedo Sep 7, 2019
c30e695
Merge branch 'master' into fix1271
douglasmuraoka Sep 9, 2019
ecbdc08
Merge branch 'master' into fix1271
douglasmuraoka Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/dashboard/Data/Browser/BrowserToolbar.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Toolbar from 'components/Toolbar/Toolbar.react';

let BrowserToolbar = ({
className,
classNameForPermissionsEditor,
classNameForEditors,
count,
perms,
schema,
Expand Down Expand Up @@ -145,7 +145,7 @@ let BrowserToolbar = ({

const userPointers = [];
const schemaSimplifiedData = {};
const classSchema = schema.data.get('classes').get(className);
const classSchema = schema.data.get('classes').get(classNameForEditors);
if (classSchema) {
classSchema.forEach(({ type, targetClass }, col) => {
if (name === 'objectId' || isUnique && name !== uniqueField) {
Expand Down Expand Up @@ -189,13 +189,13 @@ let BrowserToolbar = ({
schema={schemaSimplifiedData}
filters={filters}
onChange={onFilterChange}
className={className} />
className={classNameForEditors} />
<div className={styles.toolbarSeparator} />
{enableSecurityDialog ? <SecurityDialog
setCurrent={setCurrent}
disabled={!!relation || !!isUnique}
perms={perms}
className={classNameForPermissionsEditor}
className={classNameForEditors}
onChangeCLP={onChangeCLP}
userPointers={userPointers} /> : <noscript />}
{enableSecurityDialog ? <div className={styles.toolbarSeparator} /> : <noscript/>}
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Browser/DataBrowser.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export default class DataBrowser extends React.Component {
count={count}
hidePerms={className === '_Installation'}
className={SpecialClasses[className] || className}
classNameForPermissionsEditor={className}
classNameForEditors={className}
setCurrent={this.setCurrent}
enableDeleteAllRows={this.context.currentApp.serverInfo.features.schemas.clearAllDataFromClass && !preventSchemaEdits}
enableExportClass={this.context.currentApp.serverInfo.features.schemas.exportClass && !preventSchemaEdits}
Expand Down