diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2011-10-25 14:25:31 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2011-10-26 12:55:04 +0000 |
| commit | 5773afad44584f02b158a964847c4674269c16e8 (patch) | |
| tree | ab682878fb1627959946b4797e4e8442f2481693 | |
| parent | f168afbeb6e88e6ba66d7472529c35ed78dc6bc0 (diff) | |
| download | freeipa.git-5773afad44584f02b158a964847c4674269c16e8.tar.gz freeipa.git-5773afad44584f02b158a964847c4674269c16e8.tar.xz freeipa.git-5773afad44584f02b158a964847c4674269c16e8.zip | |
Fixed host Enrolled column.
The Enrolled column in the host search page has been added back
to show the host enrollment status based on has_keytab attribute.
Ticket #2020
| -rw-r--r-- | install/ui/host.js | 6 | ||||
| -rw-r--r-- | install/ui/test/data/host_find.json | 59 |
2 files changed, 40 insertions, 25 deletions
diff --git a/install/ui/host.js b/install/ui/host.js index b5028729..4c0ce6ed 100644 --- a/install/ui/host.js +++ b/install/ui/host.js @@ -31,7 +31,11 @@ IPA.entity_factories.host = function () { search_facet({ columns: [ 'fqdn', - 'description' + 'description', + { + name: 'has_keytab', + label: IPA.messages.objects.host.enrolled + } ] }). details_facet({ diff --git a/install/ui/test/data/host_find.json b/install/ui/test/data/host_find.json index 48b1fcb8..34ca71a2 100644 --- a/install/ui/test/data/host_find.json +++ b/install/ui/test/data/host_find.json @@ -1,6 +1,6 @@ { "error": null, - "id": 0, + "id": null, "result": { "count": 2, "result": [ @@ -8,46 +8,44 @@ "cn": [ "dev.example.com" ], - "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=example,dc=com", + "enrolledby_user": [ + "admin" + ], "fqdn": [ "dev.example.com" ], + "has_keytab": true, + "has_password": false, "ipauniqueid": [ - "fc6a6d5a-f388-11df-9c01-00163e72f2d9" + "d2c1f41c-ff41-11e0-bde8-525400e135d8" ], "krbextradata": [ { - "__base64__": "AAL+5+VMYWRtaW4vYWRtaW5AREVWLkVYQU1QTEUuQ09NAA==" - }, - { - "__base64__": "AAgBAA==" + "__base64__": "AAIIEqdOaG9zdC9kZXYuZXhhbXBsZS5jb21ASURNLkxBQi5CT1MuUkVESEFULkNPTQA=" } ], "krblastpwdchange": [ - "20101119025910Z" - ], - "krbpasswordexpiration": [ - "19700101000000Z" + "20111025194616Z" ], "krbprincipalname": [ - "host/dev.example.com@DEV.EXAMPLE.COM" + "host/dev.example.com@EXAMPLE.COM" ], - "krbticketflags": [ - "0" + "managedby_host": [ + "dev.example.com" ], - "managedby": [ - "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + "managing_host": [ + "dev.example.com" ], "objectclass": [ - "top", "ipaobject", "nshost", "ipahost", - "ipaservice", "pkiuser", + "ipaservice", "krbprincipalaux", "krbprincipal", - "krbticketpolicyaux" + "top" ], "serverhostname": [ "dev" @@ -57,18 +55,31 @@ "cn": [ "test.example.com" ], - "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=example,dc=com", + "enrolledby_user": [ + "admin" + ], "fqdn": [ "test.example.com" ], + "has_keytab": false, + "has_password": false, "ipauniqueid": [ - "ac28dca0-f3b5-11df-879f-00163e72f2d9" + "d5d1400e-ff41-11e0-9a21-525400e135d8" + ], + "krbextradata": [ + { + "__base64__": "AAIiEqdOaG9zdC90ZXN0LmV4YW1wbGUuY29tQElETS5MQUIuQk9TLlJFREhBVC5DT00A" + } ], "krbprincipalname": [ - "host/test.example.com@DEV.EXAMPLE.COM" + "host/test.example.com@EXAMPLE.COM" + ], + "managedby_host": [ + "test.example.com" ], - "managedby": [ - "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + "managing_host": [ + "test.example.com" ], "objectclass": [ "ipaobject", |