Merge branch 'master' of https://github.com/volosoft/abp

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">' + l('DisplayName:IsDefault') + '</span>';
+                        }
+                        if (row.isPublic) {
+                            name += '<span class="badge badge-pill badge-info ml-1">' + l('DisplayName:IsPublic') + '</span>';
+                        }
+                        return name;
+                    }
                 }
             ]
         }));