vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

client: Don't override organization plans with personal plan (#53842)

Browse source 
This PR makes it so we don't override organization plans with the user's
personal plan.

If an organization is selected and does not have a plan, we want to
return `None` for the plan.

Closes CLO-655.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2026-04-14 10:55:03 -04:00 committed by GitHub
parent 24a304c140
commit 01fb4765a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/client/src/user.rs
View file

@ -755,10 +755,8 @@ impl UserStore {
};
}
if let Some(organization) = &self.current_organization
&& let Some(plan) = self.plan_for_organization(&organization.id)
{
return Some(plan);
if let Some(organization) = &self.current_organization {
return self.plan_for_organization(&organization.id);
}
self.plan_info.as_ref().map(|info| info.plan())