yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-23 08:09:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3257 from strapi/fix/beta-ui-issues

Browse Source 
Fix UI issues
This commit is contained in:
Jim LAURIE 2019-05-14 11:22:23 +02:00 committed by GitHub
commit 3dbc38fadb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js
View File

@ -35,7 +35,7 @@ function LeftMenuFooter({ version, ...rest }) {
<LeftMenuLink <LeftMenuLink
{...rest} {...rest}
{...link} {...link}
destination={messages[link.label].id} label={messages[link.label].id}
key={link.label} key={link.label}
/> />
))} ))}

2
packages/strapi-admin/admin/src/containers/PluginDispatcher/index.js
View File

@ -44,7 +44,7 @@ export function PluginDispatcher(props) {
return ( return (
<div> <div>
<Helmet title={`Stapi - ${name}`} /> <Helmet title={`Strapi - ${name}`} />
<ErrorBoundary> <ErrorBoundary>
<PluginEntryComponent {...props} {...blockerComponentProps} /> <PluginEntryComponent {...props} {...blockerComponentProps} />
</ErrorBoundary> </ErrorBoundary>

2
packages/strapi-admin/admin/src/translations/en.json
View File

@ -10,7 +10,7 @@
"Provider": "Provider", "Provider": "Provider",
"ResetPasswordToken": "Reset Password Token", "ResetPasswordToken": "Reset Password Token",
"Role": "Role", "Role": "Role",
"Roles & Permissions": "Roles & Permission", "Roles & Permissions": "Roles & Permissions",
"Settings Manager": "Settings Manager", "Settings Manager": "Settings Manager",
"Username": "Username", "Username": "Username",
"Users": "Users", "Users": "Users",

6
packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js
View File

@ -165,7 +165,7 @@ class SettingsPage extends React.PureComponent {
confirm: 'content-manager.popUpWarning.button.confirm', confirm: 'content-manager.popUpWarning.button.confirm',
}} }}
popUpWarningType="danger" popUpWarningType="danger"
onConfirm={onSubmit} onConfirm={() => onSubmit(this.context)}
/> />
<PopUpWarning <PopUpWarning
isOpen={showWarningCancel} isOpen={showWarningCancel}
@ -210,6 +210,10 @@ class SettingsPage extends React.PureComponent {
SettingsPage.defaultProps = {}; SettingsPage.defaultProps = {};
SettingsPage.contextTypes = {
emitEvent: PropTypes.func,
};
SettingsPage.propTypes = { SettingsPage.propTypes = {
history: PropTypes.object.isRequired, history: PropTypes.object.isRequired,
location: PropTypes.object.isRequired, location: PropTypes.object.isRequired,