From 9759e7d57ae837708654756abd29767417ca6972 Mon Sep 17 00:00:00 2001 From: Turcy Date: Tue, 11 Aug 2020 14:43:52 +0530 Subject: [PATCH] Fix user-invitation email issues --- .../cdmf.page.users/public/js/listing.js | 9 +- .../email/templates/user-enrollment.vm | 16 +- .../email/templates/user-registration.vm | 16 +- .../default-enrollment-invitation.vm | 173 +----------------- .../email/templates/user-enrollment.vm | 173 +----------------- .../email/templates/user-registration.vm | 173 +----------------- 6 files changed, 17 insertions(+), 543 deletions(-) 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 05f582844ab..9e3733481ef 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 @@ -112,10 +112,11 @@ $("a#invite-user-link").click(function () { * Function to get selected usernames. */ function getSelectedUsernames() { - var usernameList = []; - var userList = $("#user-grid").find("tr.DTTT_selected"); - userList.each(function () { - usernameList.push($(this).data('username')); + const tbl = $('#user-grid').DataTable(); + let usernameList = []; + let userList = $("#user-grid").find("tr.DTTT_selected"); + userList.each(function (idx, el) { + usernameList.push(tbl.row(el).data().username); }); return usernameList; } diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm index 69aad7b8303..d74e28ab7b0 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm @@ -26,10 +26,9 @@
-
+
- WSO2 + entgra
@@ -50,18 +49,9 @@

- WSO2 IoT Server Administrator + Entgra IoT Administrator

-
- - - - -
WSO2
-
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm index ca20e42d7f5..906869a2869 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm @@ -26,10 +26,9 @@
-
+
- WSO2 + entgra
@@ -60,18 +59,9 @@

- WSO2 IoT Server Administrator + Entgra IoT Administrator

-
- - - - -
WSO2
-
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm b/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm index 6084f37ec10..fff7afa9de1 100644 --- a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm +++ b/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm @@ -26,178 +26,9 @@
-
+
- entgra.io + entgra
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm b/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm index 0c29e86b4ba..20bcf6e7680 100644 --- a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm +++ b/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm @@ -26,178 +26,9 @@
-
+
- entgra.io + entgra
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm b/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm index 5d4592007e4..0593f321665 100644 --- a/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm +++ b/features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm @@ -26,178 +26,9 @@
-
+
- entgra.io + entgra