Skip to content
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

[#3302] - Fixed saved devices not showing #3303

Merged
merged 2 commits into from
Nov 18, 2019
Merged

[#3302] - Fixed saved devices not showing #3303

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7baa39
[#3302] - remove console.log statement. Fix deviceInAssignment method
Nov 14, 2019
fd7fb03
[#3302] Retrieve numeric ids by using `keyId` peroperty
muloem Nov 15, 2019
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: 2 additions & 5 deletions Dashboard/app/js/lib/views/devices/assignment-edit-views.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ FLOW.AssignmentEditView = FLOW.ReactComponentView.extend(
},

getProps() {
console.log(this.selectedSurveys, this.forms);

const strings = {
saveAssignment: Ember.String.loc('_save'),
settings: Ember.String.loc('_settings'),
Expand Down Expand Up @@ -141,6 +139,7 @@ FLOW.AssignmentEditView = FLOW.ReactComponentView.extend(
activeDeviceGroups: this.activeDeviceGroups,
initialSurveyGroup: this.initialSurveyGroup,
numberOfForms: this.selectedSurveys.length,
numberOfDevices: this.selectedDevices.length,
};

return {
Expand Down Expand Up @@ -262,7 +261,6 @@ FLOW.AssignmentEditView = FLOW.ReactComponentView.extend(
.forEach(formId => {
const form = FLOW.Survey.find(formId);
if (form && form.get('keyId')) {
console.log('PUSHING AT:: SETUP');
this.selectedSurveys.push(form);

// load selected survey group
Expand Down Expand Up @@ -469,7 +467,7 @@ FLOW.AssignmentEditView = FLOW.ReactComponentView.extend(

deviceInAssignment(deviceId) {
const devicesInAssignment = this.selectedDevices.map(item =>
item.get('id')
item.get('keyId')
);

return devicesInAssignment
Expand Down Expand Up @@ -519,7 +517,6 @@ FLOW.AssignmentEditView = FLOW.ReactComponentView.extend(
// add/remove form to/from assignment
if (this.forms[formId].checked) {
// push survey to selectedSurveys
console.log('PUSHING AT:: CHECK');
this.selectedSurveys.push(FLOW.Survey.find(formId));
} else {
this.selectedSurveys.pop(FLOW.Survey.find(formId));
Expand Down