Skip to content

Commit

Permalink
Merge pull request #3087 from akvo/issue/3051-disable-selecting-all-d…
Browse files Browse the repository at this point in the history
…evices

Remove ability to select all devices (connect #3051)
  • Loading branch information
Valeria Rogatchevskikh authored May 6, 2019
2 parents abdd588 + 0e61c63 commit f07ec66
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
8 changes: 0 additions & 8 deletions Dashboard/app/js/lib/controllers/device-controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,6 @@ FLOW.deviceControl = Ember.ArrayController.create({
this.set('sortAscending', false);
},

allAreSelected: Ember.computed(function (key, value) {
if (arguments.length === 2) {
this.setEach('isSelected', value);
return value;
}
return !this.get('isEmpty') && this.everyProperty('isSelected', true);
}).property('@each.isSelected'),

atLeastOneSelected: Ember.computed(function () {
return this.filterProperty('isSelected', true).get('length');
}).property('@each.isSelected'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
<table class="dataTable" id="surveyDataTable">
<!-- TABLE HEADER-->
<thead>
<tr> {{#view FLOW.ColumnView item="select" }}
{{view Ember.Checkbox checkedBinding="FLOW.deviceControl.allAreSelected"}}
{{/view}}
<tr>
{{#view FLOW.ColumnView item="select" class="noArrows"}}{{/view}}
{{#view FLOW.ColumnView item="IMEI" type="device"}} <a {{action "sort" target="this"}}>{{t _imei}} {{tooltip _imei_tooltip}}</a> {{/view}}
{{#view FLOW.ColumnView item="deviceIdentifier" type="device"}} <a {{action "sort" target="this"}}>{{t _device_id}}</a> {{/view}}
{{#view FLOW.ColumnView item="deviceGroup" type="device"}} <a {{action "sort" target="this"}}>{{t _device_group}}</a> {{/view}}
Expand Down

0 comments on commit f07ec66

Please sign in to comment.