From dd645a9fda82bf46e4c7d8ae49b2c05bbe0d3f92 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 14 Feb 2017 14:43:16 +0530 Subject: [PATCH 1/2] Fixing footer getting cluttered on /devicemgt/devices/search page --- .../devicemgt/app/pages/cdmf.page.device.search/search.hbs | 1 + 1 file changed, 1 insertion(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/search.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/search.hbs index 0bb38a9492..036384d843 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/search.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/search.hbs @@ -152,6 +152,7 @@ + {{/zone}} {{#zone "bottomJs"}} From a107a0392e4fd871880ecc131abe61b2ee6f3c72 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 25 Apr 2017 08:27:41 +0530 Subject: [PATCH 2/2] Fixing #703 : missing ContentType header on datatable invoker api --- .../jaggeryapps/devicemgt/api/data-tables-invoker-api.jag | 1 + 1 file changed, 1 insertion(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag index f8cfa13520..5f34c84699 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag @@ -62,6 +62,7 @@ if (uriMatcher.match("/{context}/api/data-tables/invoker")) { function (backendResponse) { response["status"] = backendResponse["status"]; response["content"] = utility.encodeJson(backendResponse["responseText"]); + response["contentType"] = "application/json"; } ); }