Skip to content

Correcting #163 to exclude activation_time from /staged PATCH #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lo-simon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Correcting #163 to exclude activation_time from /staged PATCH #169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Development/src/dataProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
UPDATE,
fetchUtils,
} from 'react-admin';
import { assign, get, has, isEmpty, set } from 'lodash';
import { assign, get, has, isEmpty, pick, set } from 'lodash';
import { JsonPointer } from 'json-ptr';
import diff from 'deep-diff';
import { makeBearerAuthHeader } from './authProvider';
Expand Down Expand Up @@ -589,11 +589,12 @@ const convertDataProviderRequestToHTTP = (
// devices that leave activate_immediate on /staged (see #97). A null mode is
// only sent when it appears in the differences, so unrelated edits do not
// cancel a pending activation.
if (get(params, 'data.$staged.activation.mode') != null) {
const activation = get(params, 'data.$staged.activation');
if (get(activation, 'mode') != null) {
set(
patchData,
'activation',
get(params, 'data.$staged.activation')
pick(activation, ['mode', 'requested_time'])
);
}

Expand Down