From 2416b3e5d849644576bb31373889047871d0d39c Mon Sep 17 00:00:00 2001 From: kamidu Date: Wed, 5 Apr 2017 11:13:21 +0530 Subject: [PATCH 1/4] fixing device status (cherry picked from commit fe71036) --- .../app/pages/cdmf.page.devices/public/js/listing.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index 28c0e1f074..348b8d4c05 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -464,11 +464,11 @@ function loadDevices(searchType, searchParam) { attachDeviceEvents(); - // if ($('.advance-search').length < 1) { - // $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') - // .after('Advance Search'); - // } + if ($('.advance-search').length < 1) { + $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') + .after('Advance Search'); + } }, { "placeholder": "Search By Device Name", From 5263c685e8254ccc7663493f74322ea3fc1b9d00 Mon Sep 17 00:00:00 2001 From: kamidu Date: Wed, 5 Apr 2017 11:23:05 +0530 Subject: [PATCH 2/4] disableing advanced search (cherry picked from commit caf2d40) --- .../app/pages/cdmf.page.devices/public/js/listing.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index 348b8d4c05..28c0e1f074 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -464,11 +464,11 @@ function loadDevices(searchType, searchParam) { attachDeviceEvents(); - if ($('.advance-search').length < 1) { - $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') - .after('Advance Search'); - } + // if ($('.advance-search').length < 1) { + // $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') + // .after('Advance Search'); + // } }, { "placeholder": "Search By Device Name", From 72f42645efd8ca79c32c90d467c4e917f6a66357 Mon Sep 17 00:00:00 2001 From: kamidu Date: Wed, 5 Apr 2017 11:13:21 +0530 Subject: [PATCH 3/4] fixing device status (cherry picked from commit fe71036) --- .../app/pages/cdmf.page.devices/public/js/listing.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index 28c0e1f074..348b8d4c05 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -464,11 +464,11 @@ function loadDevices(searchType, searchParam) { attachDeviceEvents(); - // if ($('.advance-search').length < 1) { - // $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') - // .after('Advance Search'); - // } + if ($('.advance-search').length < 1) { + $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') + .after('Advance Search'); + } }, { "placeholder": "Search By Device Name", From 00e4ac11229504d1f9b0f6af9b95c63e86436c63 Mon Sep 17 00:00:00 2001 From: kamidu Date: Wed, 5 Apr 2017 11:23:05 +0530 Subject: [PATCH 4/4] disableing advanced search (cherry picked from commit caf2d40) --- .../app/pages/cdmf.page.devices/public/js/listing.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index 348b8d4c05..28c0e1f074 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -464,11 +464,11 @@ function loadDevices(searchType, searchParam) { attachDeviceEvents(); - if ($('.advance-search').length < 1) { - $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') - .after('Advance Search'); - } + // if ($('.advance-search').length < 1) { + // $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') + // .after('Advance Search'); + // } }, { "placeholder": "Search By Device Name",