+ BREW LOCKED
+ This brew been locked by the Administrators. It will not be accessible by any method other than the Editor until the lock is removed.
+ LOCK REASON
+ {props.message || 'Unable to retrieve Lock Message'}
+ Once you have resolved this issue, click REQUEST LOCK REMOVAL to notify the Administrators for review.
+ Click CONTINUE TO EDITOR to temporarily hide this notification; it will reappear the next time the page is reloaded.
+ REQUEST LOCK REMOVAL
+ ;
+};
+
+module.exports = LockNotification;
diff --git a/client/homebrew/pages/editPage/lockNotification/lockNotification.less b/client/homebrew/pages/editPage/lockNotification/lockNotification.less
new file mode 100644
index 000000000..54f1a9569
--- /dev/null
+++ b/client/homebrew/pages/editPage/lockNotification/lockNotification.less
@@ -0,0 +1,27 @@
+.lockNotification {
+ z-index : 1;
+ width : 80%;
+ padding : 10px;
+ margin : 5% 10%;
+ line-height : 1.5em;
+ color : black;
+ text-align : center;
+ background-color : #CCCCCC;
+
+ &::backdrop { background-color : #000000AA; }
+
+ button {
+ margin : 10px;
+ color : white;
+ background-color : #333333;
+
+ &:hover { background-color : #777777; }
+ }
+
+ h1, h3 {
+ font-family : 'Open Sans', sans-serif;
+ font-weight : 800;
+ }
+ h1 { font-size : 24px; }
+ h3 { font-size : 18px; }
+}
diff --git a/client/homebrew/pages/errorPage/errors/errorIndex.js b/client/homebrew/pages/errorPage/errors/errorIndex.js
index 7fa24dddc..58725fe3f 100644
--- a/client/homebrew/pages/errorPage/errors/errorIndex.js
+++ b/client/homebrew/pages/errorPage/errors/errorIndex.js
@@ -140,7 +140,7 @@ const errorIndex = (props)=>{
'100' : dedent`
## This brew has been locked.
- Please contact the Administrators to unlock this document.
+ Only an author may request that this lock is removed.
:
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index ae1abf787..f755c8f23 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -55,7 +55,7 @@ const api = {
stub = stub?.toObject();
if(stub?.lock?.locked && accessType != 'edit') {
- throw { HBErrorCode: '100', code: stub.lock.code, message: stub.lock.message, brewId: stub.shareId, brewTitle: stub.title };
+ throw { HBErrorCode: '100', code: stub.lock.code, message: stub.lock.shareMessage, brewId: stub.shareId, brewTitle: stub.title };
}
// If there is a google id, try to find the google brew
diff --git a/server/homebrew.api.spec.js b/server/homebrew.api.spec.js
index 8a4748e38..c8539bf63 100644
--- a/server/homebrew.api.spec.js
+++ b/server/homebrew.api.spec.js
@@ -300,7 +300,7 @@ describe('Tests for api', ()=>{
});
it('access is denied to a locked brew', async()=>{
- const lockBrew = { title: 'test brew', shareId: '1', lock: { locked: true, code: 404, message: 'brew locked' } };
+ const lockBrew = { title: 'test brew', shareId: '1', lock: { locked: true, code: 404, shareMessage: 'brew locked' } };
model.get = jest.fn(()=>toBrewPromise(lockBrew));
api.getId = jest.fn(()=>({ id: '1', googleId: undefined }));
diff --git a/shared/homebrewery/renderWarnings/renderWarnings.jsx b/shared/homebrewery/renderWarnings/renderWarnings.jsx
index 6028f1708..e9c5f6f57 100644
--- a/shared/homebrewery/renderWarnings/renderWarnings.jsx
+++ b/shared/homebrewery/renderWarnings/renderWarnings.jsx
@@ -3,7 +3,7 @@ const React = require('react');
const createClass = require('create-react-class');
const _ = require('lodash');
-const DISMISS_KEY = 'dismiss_render_warning';
+import Dialog from '../../../client/components/dialog.jsx';
const RenderWarnings = createClass({
displayName : 'RenderWarnings',
@@ -34,9 +34,6 @@ const RenderWarnings = createClass({
},
},
checkWarnings : function(){
- const hideDismiss = localStorage.getItem(DISMISS_KEY);
- if(hideDismiss) return this.setState({ warnings: {} });
-
this.setState({
warnings : _.reduce(this.warnings, (r, fn, type)=>{
const element = fn();
@@ -45,20 +42,18 @@ const RenderWarnings = createClass({
}, {})
});
},
- dismiss : function(){
- localStorage.setItem(DISMISS_KEY, true);
- this.checkWarnings();
- },
render : function(){
if(_.isEmpty(this.state.warnings)) return null;
- return