diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 946901747..44f67d0e2 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -210,11 +210,7 @@ const EditPage = createClass({ }); this.savedBrew = res.body; - if(this.state.saveGoogle && transfer) { - history.replaceState(null, null, `/edit/${this.savedBrew.googleId}${this.savedBrew.editId}`); - } else if(transfer) { - history.replaceState(null, null, `/edit/${this.savedBrew.editId}`); - } + history.replaceState(null, null, `/edit/${this.savedBrew.googleId ?? ''}${this.savedBrew.editId}`); this.setState((prevState)=>({ brew : _.merge({}, prevState.brew, { diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index c3278d405..b57da013a 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -174,7 +174,7 @@ const NewPage = createClass({ localStorage.removeItem(BREWKEY); localStorage.removeItem(STYLEKEY); localStorage.removeItem(METAKEY); - window.location = `/edit/${brew.googleId ? brew.googleId : ''}${brew.editId}`; + window.location = `/edit/${brew.googleId ?? ''}${brew.editId}`; }, renderSaveButton : function(){ diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 080f61822..6faa69719 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -109,7 +109,7 @@ const updateBrew = async (req, res)=>{ const { transferToGoogle, transferFromGoogle } = req.query; let saved; - if(!!brew.googleId && transferFromGoogle) { + if(brew.googleId && transferFromGoogle) { beforeNewSave(req.account, brew); saved = await newLocalBrew(brew) @@ -137,7 +137,7 @@ const updateBrew = async (req, res)=>{ console.error(err); res.status(err.status).send(err.message); }); - } else if(!!brew.googleId) { + } else if(brew.googleId) { brew.text = mergeBrewText(brew); saved = await GoogleActions.updateGoogleBrew(brew)