diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js index a283f496da..4b1fa993b5 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js @@ -77,7 +77,7 @@ export class ListPage extends React.Component { location: { pathname, search }, } = prevProps; const { - listPage: { deleteAllSuccess, filtersUpdated }, + listPage: { filtersUpdated }, } = this.props; if (pathname !== this.props.location.pathname) { @@ -89,10 +89,6 @@ export class ListPage extends React.Component { this.getData(this.props); } - if (prevProps.listPage.deleteAllSuccess !== deleteAllSuccess) { - this.getData(this.props); - } - if (prevProps.listPage.filtersUpdated !== filtersUpdated) { const updatedSearch = this.generateSearch(); this.props.history.push({ pathname, search: updatedSearch }); diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js index 57d3e1299d..007162b55f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js @@ -30,7 +30,6 @@ import { const initialState = fromJS({ appliedFilters: List([]), count: 0, - deleteAllSuccess: false, entriesToDelete: List([]), filters: List([]), filtersUpdated: false, @@ -64,8 +63,7 @@ function listPageReducer(state = initialState, action) { case DELETE_SEVERAL_DATA_SUCCESS: return state .update('showWarningDeleteAll', () => false) - .update('entriesToDelete', () => List([])) - .update('deleteAllSuccess', v => v = !v); + .update('entriesToDelete', () => List([])); case CHANGE_PARAMS: return state.updateIn(action.keys, () => action.value); case GET_DATA_SUCCEEDED: diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/saga.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/saga.js index e5f2f097bf..548b8f770d 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/saga.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/saga.js @@ -101,6 +101,7 @@ export function* dataDeleteAll({ entriesToDelete, model, source }) { }); yield put(deleteSeveralDataSuccess()); + yield call(dataGet, { currentModel: model, source }); } catch(err) { strapi.notification.error('content-manager.error.record.delete'); } diff --git a/packages/strapi-plugin-content-manager/config/layout.json b/packages/strapi-plugin-content-manager/config/layout.json index bbbdee435c..0967ef424b 100644 --- a/packages/strapi-plugin-content-manager/config/layout.json +++ b/packages/strapi-plugin-content-manager/config/layout.json @@ -1,9 +1 @@ -{ - "product": { - "attributes": { - "name": { - "appearance": "" - } - } - } -} \ No newline at end of file +{} diff --git a/packages/strapi-plugin-content-manager/config/queries/bookshelf.js b/packages/strapi-plugin-content-manager/config/queries/bookshelf.js index 7fe495f904..ae920d799b 100755 --- a/packages/strapi-plugin-content-manager/config/queries/bookshelf.js +++ b/packages/strapi-plugin-content-manager/config/queries/bookshelf.js @@ -8,8 +8,6 @@ module.exports = { for (const value in where.value) { qb[value ? 'where' : 'orWhere'](key, where.symbol, where.value[value]); } - // } else if (where.symbol === 'IN') { - // qb.whereIn(key, where.value); } else { qb.where(key, where.symbol, where.value); } diff --git a/packages/strapi-plugin-users-permissions/models/User.settings.json b/packages/strapi-plugin-users-permissions/models/User.settings.json index 32b00d4ec3..99479b1cba 100644 --- a/packages/strapi-plugin-users-permissions/models/User.settings.json +++ b/packages/strapi-plugin-users-permissions/models/User.settings.json @@ -38,10 +38,6 @@ "via": "users", "plugin": "users-permissions", "configurable": false - }, - "products": { - "collection": "product", - "via": "user" } } -} \ No newline at end of file +}