Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) Fix ACL bug with rec.id in formula

Browse Source 
Summary:
A regression was causing rec.id in formulas to be flagged as
invalid.

Test Plan: Browser tests.

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D3882
This commit is contained in:
George Gevoian 2023-04-25 11:07:10 -07:00
parent b4cc519616
commit 8bedaedab6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/client/aclui/AccessRules.ts
View File

@ -507,8 +507,7 @@ export class AccessRules extends Disposable {
// Returns a list of valid colIds for the given table, or undefined if the table isn't valid. // Returns a list of valid colIds for the given table, or undefined if the table isn't valid.
public getValidColIds(tableId: string): string[]|undefined { public getValidColIds(tableId: string): string[]|undefined {
return this._aclResources.get(tableId)?.colIds.filter(id => return this._aclResources.get(tableId)?.colIds.filter(id => !isHiddenCol(id)).sort();
!isHiddenCol(id) && id !== 'id').sort();
} }
// Get rules to use for seeding any new set of table/column rules, e.g. to give owners // Get rules to use for seeding any new set of table/column rules, e.g. to give owners
@ -1084,7 +1083,7 @@ class ColumnObsRuleSet extends ObsRuleSet {
} }
public buildResourceDom(): DomElementArg { public buildResourceDom(): DomElementArg {
return aclColumnList(this._colIds, this.getValidColIds()); return aclColumnList(this._colIds, this._getValidColIdsList());
} }
public getColIdList(): string[] { public getColIdList(): string[] {
@ -1107,6 +1106,10 @@ class ColumnObsRuleSet extends ObsRuleSet {
public hasColumns() { public hasColumns() {
return true; return true;
} }
private _getValidColIdsList(): string[] {
return this.getValidColIds().filter(id => id !== 'id');
}
} }
class DefaultObsRuleSet extends ObsRuleSet { class DefaultObsRuleSet extends ObsRuleSet {