f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 16:22:44 +00:00
Code Wiki Activity

update based on feedback

Browse Source
This commit is contained in:
Charlie Humphreys
2022-03-24 13:46:23 -05:00
parent b19efcebb9
commit bba0208361
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -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, {

2
client/homebrew/pages/newPage/newPage.jsx
View File

@@ -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(){

4
server/homebrew.api.js
View File

@@ -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)