|
88 | 88 |
|
89 | 89 | // Make sure the master checkbox is unselected |
90 | 90 | if (multiSelect) { |
91 | | - $instanceRow.closest('.list-view').find('input.multiSelectMasterCheckbox').attr('checked', false); |
| 91 | + var $listView = $instanceRow.closest('.list-view'); |
| 92 | + $listView.find('input.multiSelectMasterCheckbox').prop('checked', false); |
| 93 | + toggleMultiSelectActions($listView, false); |
92 | 94 | } |
93 | 95 |
|
94 | 96 | var externalLinkAction = action.externalLink; |
|
860 | 862 | if (groupableColumns) { |
861 | 863 | $tr.addClass('groupable-header-columns').addClass('groupable-header'); |
862 | 864 | $.each(fields, function(key) { |
| 865 | + if ($.inArray(key, hiddenFields) != -1) |
| 866 | + return true; |
863 | 867 | var field = this; |
864 | 868 | if (field.columns) { |
865 | 869 | var colspan = Object.keys(field.columns).length; |
|
882 | 886 |
|
883 | 887 | if (multiSelect) { |
884 | 888 | var $th = $('<th>').addClass('multiselect').appendTo($tr); |
885 | | - var content = $('<input>') |
| 889 | + var $multiSelectMaster = $('<input>') |
886 | 890 | .attr('type', 'checkbox') |
887 | | - .addClass('multiSelectMasterCheckbox') |
888 | | - .appendTo($th); |
| 891 | + .addClass('multiSelectMasterCheckbox'); |
| 892 | + $multiSelectMaster.appendTo($th); |
889 | 893 |
|
890 | | - content.click(function() { |
891 | | - var checked = $(this).is(':checked'); |
892 | | - $('.multiSelectCheckbox').attr('checked', checked); |
893 | | - toggleMultiSelectActions($table.closest('.list-view'), checked); |
| 894 | + $multiSelectMaster.click(function() { |
| 895 | + var isMasterChecked = $(this).prop('checked'); |
| 896 | + $('.multiSelectCheckbox').prop('checked', isMasterChecked); |
| 897 | + toggleMultiSelectActions($table.closest('.list-view'), isMasterChecked); |
894 | 898 | }); |
895 | 899 | } |
896 | 900 |
|
|
1203 | 1207 | var reducedFields = {}; |
1204 | 1208 | var idx = 0; |
1205 | 1209 | $.each(fields, function(key) { |
| 1210 | + if ($.inArray(key, hiddenFields) != -1) |
| 1211 | + return true; |
1206 | 1212 | var field = this; |
1207 | 1213 | if (field.columns) { |
1208 | 1214 | $.each(field.columns, function(innerKey) { |
|
0 commit comments