From 3d5b6cd89fd879280f867fa0b5724234acd3fcc8 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Thu, 22 Sep 2016 14:14:07 +0530 Subject: [PATCH 1/3] Removing unwanted url params from datatable serverside search --- .../public/js/dataTables.extended.serversidepaging.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js index 3b2fddb195..3c8f6ce103 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js @@ -65,6 +65,9 @@ $.fn.datatables_extended_serverside_paging = function (settings , url, dataFilte // params.filter = params.search.value; // } params.url = url; + + //Remove this line to add url parameters which is included by data tables it self + delete params.columns; }, dataFilter: dataFilter }, From 5954fd9070097de725c7a91713825fc51722ccd2 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Mon, 26 Sep 2016 19:41:20 +0530 Subject: [PATCH 2/3] EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode --- .../app/pages/cdmf.page.users/public/js/listing.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js index acceff1fc8..2d5b88e35b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js @@ -43,7 +43,16 @@ var modalPopup = ".modal"; var modalPopupContainer = modalPopup + " .modal-content"; var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; -$(".icon .text").res_text(0.2); + +/** + * + * Fires the res_text when ever a data table redraw occurs making + * the font icons change the size to respective screen resolution. + * + */ +$(document).on( 'draw.dt', function () { + $(".icon .text").res_text(0.2); +} ); /* * set popup maximum height function. From de63beaaa6cfb833df695d75e2e1b9032de90619 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Mon, 26 Sep 2016 20:04:14 +0530 Subject: [PATCH 3/3] Roles listing icon resize fix --- .../pages/cdmf.page.roles/public/js/role-listing.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js index 0e0457ed45..602dbc0544 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js @@ -37,7 +37,17 @@ var modalPopupContainer = modalPopup + " .modal-content"; var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; var isInit = true; -$(".icon .text").res_text(0.2); + + +/** + * + * Fires the res_text when ever a data table redraw occurs making + * the font icons change the size to respective screen resolution. + * + */ +$(document).on( 'draw.dt', function () { + $(".icon .text").res_text(0.2); +} ); /*