community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #911 from harshanL/master

Browse Source 
Fix for  wso2/product-iots#1320.
This commit is contained in:
Kamidu Sachith Punchihewa 2017-08-22 12:40:46 +05:30 committed by GitHub
commit a86c4e86f6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
View File

@ -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";