yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 03:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix redirection

Browse Source
This commit is contained in:
soupette 2019-07-17 18:22:33 +02:00
parent 4b50faf331
commit 771b8ab9b5
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/strapi-plugin-content-manager/admin/src/containers/EditView/index.js
View File

@ -148,13 +148,19 @@ function EditView({
}
};
fetchGroupLayouts();
if (!isCreatingEntry) {
fetchData();
} else {
dispatch({
type: 'INIT',
data: setDefaultForm(get(layout, ['schema', 'attributes'])),
});
}
fetchGroupLayouts();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [id, isCreatingEntry, slug, source]);
}, [id, isCreatingEntry, slug, source, pathname]);
if (shouldShowLoader) {
return <LoadingIndicatorPage />;

13
packages/strapi-plugin-content-manager/admin/src/containers/EditView/init.js
View File

@ -1,4 +1,3 @@
import { fromJS } from 'immutable';
import { get } from 'lodash';
const setDefaultForm = attributes => {
@ -34,17 +33,7 @@ const setDefaultForm = attributes => {
}, {});
};
function init(initialState, layout, isCreatingEntry) {
if (isCreatingEntry) {
const defaultForm = setDefaultForm(
get(layout, ['schema', 'attributes'], {})
);
return initialState
.update('initialData', () => fromJS(defaultForm))
.update('modifiedData', () => fromJS(defaultForm));
}
function init(initialState) {
return initialState;
}

4
packages/strapi-plugin-content-manager/admin/src/containers/EditView/reducer.js
View File

@ -85,6 +85,10 @@ function reducer(state, action) {
return obj;
})
.update('isLoadingForLayouts', () => false);
case 'INIT':
return initialState
.set('initialData', fromJS(action.data))
.set('modifiedData', fromJS(action.data));
case 'MOVE_FIELD':
return state.updateIn(['modifiedData', ...action.keys], list => {
return list