From d885d4e73b58d7a82b88cf79c7276423bbcf6044 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 26 Apr 2019 11:32:19 +0800
Subject: [PATCH 1/2] fix #1053 Show badge for public & default roles in the
 role list.

---
 .../Pages/Identity/Roles/index.js                    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
index 476b484128..1f4c0e0316 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
@@ -57,7 +57,17 @@
                     }
                 },
                 {
-                    data: "name"
+                    data: "name",
+                    render: function (data, type, row) {
+                        var name = '<span>' + data + '</span>';
+                        if (row.isDefault) {
+                            name += '<span class="badge badge-pill badge-success ml-1">Default</span>';
+                        }
+                        if (row.isPublic) {
+                            name += '<span class="badge badge-pill badge-info ml-1">Public</span>';
+                        }
+                        return name;
+                    }
                 }
             ]
         }));

From dbbbe903050c284b24f7aa2405124c521c9f8881 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 26 Apr 2019 11:38:38 +0800
Subject: [PATCH 2/2] Localized role badge.

---
 .../src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
index 1f4c0e0316..385b53f257 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
@@ -61,10 +61,10 @@
                     render: function (data, type, row) {
                         var name = '<span>' + data + '</span>';
                         if (row.isDefault) {
-                            name += '<span class="badge badge-pill badge-success ml-1">Default</span>';
+                            name += '<span class="badge badge-pill badge-success ml-1">' + l('DisplayName:IsDefault') + '</span>';
                         }
                         if (row.isPublic) {
-                            name += '<span class="badge badge-pill badge-info ml-1">Public</span>';
+                            name += '<span class="badge badge-pill badge-info ml-1">' + l('DisplayName:IsPublic') + '</span>';
                         }
                         return name;
                     }