Merge pull request #911 from harshanL/master

Fix for  wso2/product-iots#1320.
revert-70aa11f8
Kamidu Sachith Punchihewa 7 years ago committed by GitHub
commit a86c4e86f6

@ -259,7 +259,7 @@ function loadDevices(searchType, searchParam) {
var columns = [ var columns = [
{ {
targets: 0, targets: 0,
data: 'name', data: 'namePattern',
class: 'remove-padding icon-only content-fill viewEnabledIcon', class: 'remove-padding icon-only content-fill viewEnabledIcon',
render: function (data, type, row, meta) { render: function (data, type, row, meta) {
return '<div class="thumbnail icon"><img class="square-element text fw " src="' return '<div class="thumbnail icon"><img class="square-element text fw " src="'
@ -471,7 +471,8 @@ function loadDevices(searchType, searchParam) {
ownership: data.devices[index].enrolmentInfo.ownership, ownership: data.devices[index].enrolmentInfo.ownership,
deviceType: data.devices[index].type, deviceType: data.devices[index].type,
deviceIdentifier: data.devices[index].deviceIdentifier, deviceIdentifier: data.devices[index].deviceIdentifier,
name: data.devices[index].name name: data.devices[index].name,
namePattern: data.devices[index].name
} }
); );
}); });
@ -504,8 +505,8 @@ function loadDevices(searchType, searchParam) {
} }
}, { }, {
"placeholder": "Search By Device Name", "placeholder": "Top-Device-Name-Search",
"searchKey": "name" "searchKey": "namePattern"
} }
); );
@ -567,6 +568,9 @@ $(document).ready(function () {
} }
}); });
//Hide the search by device-name input
$("input[placeholder='Top-Device-Name-Search']").hide();
}); });
var modalPopup = ".modal"; var modalPopup = ".modal";

Loading…
Cancel
Save