f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-14 08:32:44 +00:00
Code Wiki Activity

Merge branch 'master' into pr/2429

Browse Source
This commit is contained in:
Trevor Buckner
2023-01-03 15:13:19 -05:00
parent 32506860dd 2b824839c3
commit 6dab5f836e
9 changed files with 357 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,7 +215,8 @@ const EditPage = createClass({
brew : { ...prevState.brew,
googleId : this.savedBrew.googleId ? this.savedBrew.googleId : null,
editId : this.savedBrew.editId,
shareId : this.savedBrew.shareId
shareId : this.savedBrew.shareId,
version : this.savedBrew.version
},
isPending : false,
isSaving : false,
@@ -314,6 +315,16 @@ const EditPage = createClass({
</Nav.item>;
}
if(this.state.errors.response.error.status === 409) {
const message = this.state.errors.response.body?.message;
return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
Oops!
<div className='errorContainer'>
{message ? message : 'Conflict: please refresh to get latest changes'}
</div>
</Nav.item>;
}
return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
Oops!
<div className='errorContainer'>