gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-08 10:58:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: update set_current_project function to properly handle user and project ID updates

Browse Source
This commit is contained in:
Kiril Videlov 2023-11-22 19:59:44 +01:00 committed by Kiril Videlov
parent db46907fb0
commit e80f806ff4
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/tauri/src/users/commands.rs
View File

@ -62,32 +62,26 @@ pub async fn set_current_project(
project_id: Option<&str>,
) -> Result<(), Error> {
let app = handle.state::<Controller>();
match app.get_user()? {
Some(user) => {
let mut user = user;
match project_id {
Some(project_id) => {
user.current_project = Some(project_id.to_string());
}
None => {
user.current_project = None;
}
if let Some(user) = app.get_user()? {
let mut user = user;
match project_id {
Some(project_id) => {
user.current_project = Some(project_id.to_string());
}
app.set_user(&user)?;
if let Some(win) = handle.get_window("main") {
let menu_handle = win.menu_handle();
_ = menu_handle
.get_item("projectsettings")
.set_enabled(project_id.is_some());
None => {
user.current_project = None;
}
Ok(())
}
None => Err({
tracing::error!("failed to get user");
Error::Unknown
}),
app.set_user(&user)?;
if let Some(win) = handle.get_window("main") {
let menu_handle = win.menu_handle();
_ = menu_handle
.get_item("projectsettings")
.set_enabled(project_id.is_some());
}
}
// TODO: persist this not on the user object
Ok(())
}
#[tauri::command(async)]