Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
b16edd32
Unverified
Commit
b16edd32
authored
1 year ago
by
Cam Saul
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Potentially fix StackOverflow in flaky tests (#32375)
parent
38916190
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/metabase/models/permissions_group.clj
+4
-4
4 additions, 4 deletions
src/metabase/models/permissions_group.clj
src/metabase/models/user.clj
+13
-10
13 additions, 10 deletions
src/metabase/models/user.clj
with
17 additions
and
14 deletions
src/metabase/models/permissions_group.clj
+
4
−
4
View file @
b16edd32
...
...
@@ -106,10 +106,10 @@
(
t2/define-before-update
:model/PermissionsGroup
[
group
]
(
let
[
changes
(
t2/changes
group
)]
(
u/prog1
group
(
check-not-magic-group
group
)
(
when-let
[
group-name
(
:name
changes
)]
(
check-name-not-already-taken
group-name
)))))
(
u/prog1
group
(
check-not-magic-group
group
)
(
when-let
[
group-name
(
:name
changes
)]
(
check-name-not-already-taken
group-name
)))))
;;; ---------------------------------------------------- Util Fns ----------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
src/metabase/models/user.clj
+
13
−
10
View file @
b16edd32
...
...
@@ -91,17 +91,20 @@
(
t2/define-after-insert
:model/User
[{
user-id
:id,
superuser?
:is_superuser,
:as
user
}]
(
u/prog1
user
;; add the newly created user to the magic perms groups
(
binding
[
perms-group-membership/*allow-changing-all-users-group-members*
true
]
(
log/info
(
trs
"Adding User {0} to All Users permissions group..."
user-id
))
(
t2/insert!
PermissionsGroupMembership
:user_id
user-id
:group_id
(
:id
(
perms-group/all-users
))))
;; add the newly created user to the magic perms groups.
(
log/info
(
trs
"Adding User {0} to All Users permissions group..."
user-id
))
(
when
superuser?
(
log/info
(
trs
"Adding User {0} to Admin permissions group..."
user-id
))
(
t2/insert!
PermissionsGroupMembership
:user_id
user-id
:group_id
(
:id
(
perms-group/admin
))))))
(
log/info
(
trs
"Adding User {0} to All Users permissions group..."
user-id
)))
(
let
[
groups
(
filter
some?
[(
perms-group/all-users
)
(
when
superuser?
(
perms-group/admin
))])]
(
binding
[
perms-group-membership/*allow-changing-all-users-group-members*
true
]
;; do a 'simple' insert against the Table name so we don't trigger the after-insert behavior
;; for [[metabase.models.permissions-group-membership]]... we don't want it recursively trying to update
;; the user
(
t2/insert!
(
t2/table-name
:model/PermissionsGroupMembership
)
(
for
[
group
groups
]
{
:user_id
user-id
:group_id
(
u/the-id
group
)}))))))
(
t2/define-before-update
:model/User
[{
:keys
[
id
]
:as
user
}]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment