diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-01-18 21:54:41 -0600 |
|---|---|---|
| committer | Petr VobornÃk <pvoborni@redhat.com> | 2012-01-23 15:38:41 +0100 |
| commit | b353239e59a8eb32fb1ac66e29228dc95b74e4e6 (patch) | |
| tree | 09093bfd4ae3a5954c680998000635c15165c91f /install/ui/test | |
| parent | fef343ae8f501aa67d4c746d9c7103d797fd6be2 (diff) | |
| download | freeipa-b353239e59a8eb32fb1ac66e29228dc95b74e4e6.tar.gz freeipa-b353239e59a8eb32fb1ac66e29228dc95b74e4e6.tar.xz freeipa-b353239e59a8eb32fb1ac66e29228dc95b74e4e6.zip | |
Fixed inconsistent status labels.
This patch modifies the status attributes in users, DNS zones,
HBAC/sudo rules, HBAC test, and SELinux User Map to use the same
label (i.e. Status) and values (i.e. Enabled/Disabled). The method
to change the status will be modified separately.
Ticket #2247
Diffstat (limited to 'install/ui/test')
| -rw-r--r-- | install/ui/test/data/dnszone_find_pkeys.json | 6 | ||||
| -rw-r--r-- | install/ui/test/data/dnszone_get_records.json | 49 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 21 |
3 files changed, 65 insertions, 11 deletions
diff --git a/install/ui/test/data/dnszone_find_pkeys.json b/install/ui/test/data/dnszone_find_pkeys.json index f40636f43..8f642cce8 100644 --- a/install/ui/test/data/dnszone_find_pkeys.json +++ b/install/ui/test/data/dnszone_find_pkeys.json @@ -15,6 +15,12 @@ "idnsname": [ "example.com" ] + }, + { + "dn": "idnsname=test.com,cn=dns,dc=example,dc=com", + "idnsname": [ + "test.com" + ] } ], "summary": null, diff --git a/install/ui/test/data/dnszone_get_records.json b/install/ui/test/data/dnszone_get_records.json index 2e14716ce..d1d20bf03 100644 --- a/install/ui/test/data/dnszone_get_records.json +++ b/install/ui/test/data/dnszone_get_records.json @@ -101,6 +101,55 @@ }, "summary": null, "value": "example.com" + }, + { + "error": null, + "result": { + "dn": "idnsname=test.com,cn=dns,dc=example,dc=com", + "idnsallowdynupdate": [ + "TRUE" + ], + "idnsname": [ + "test.com" + ], + "idnssoaexpire": [ + "1209600" + ], + "idnssoaminimum": [ + "3600" + ], + "idnssoamname": [ + "dev.example.com." + ], + "idnssoarefresh": [ + "3600" + ], + "idnssoaretry": [ + "900" + ], + "idnssoarname": [ + "root.dev.example.com." + ], + "idnssoaserial": [ + "2010021201" + ], + "idnsupdatepolicy": [ + "grant TEST.COM krb5-self * A;" + ], + "idnszoneactive": [ + "FALSE" + ], + "nsrecord": [ + "dev.example.com." + ], + "objectclass": [ + "top", + "idnsrecord", + "idnszone" + ] + }, + "summary": null, + "value": "test.com" } ] } diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index a0738734b..b819c30b1 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -202,12 +202,10 @@ "posix": "Is this a POSIX group?" }, "hbacrule": { - "active": "Active", "any_host": "Any Host", "any_service": "Any Service", "anyone": "Anyone", "host": "Accessing", - "inactive": "Inactive", "ipaenabledflag": "Rule status", "service": "Via Service", "sourcehost": "From", @@ -310,7 +308,6 @@ "commands": "Commands" }, "sudorule": { - "active": "Active", "allow": "Allow", "any_command": "Any Command", "any_group": "Any Group", @@ -320,7 +317,6 @@ "deny": "Deny", "external": "External", "host": "Access this host", - "inactive": "Inactive", "ipaenabledflag": "Rule status", "options": "Options", "runas": "As Whom", @@ -333,17 +329,13 @@ "user": { "account": "Account Settings", "account_status": "Account Status", - "activate": "Activate", - "activation_confirmation": "Are you sure you want to ${action} the user?<br/>The change will take effect immediately.", - "activation_link": "Click to ${action}", - "active": "Active", "contact": "Contact Settings", - "deactivate": "Deactivate", "employee": "Employee Information", "error_changing_status": "Error changing account status", - "inactive": "Inactive", "mailing": "Mailing Address", - "misc": "Misc. Information" + "misc": "Misc. Information", + "status_confirmation": "Are you sure you want to ${action} the user?<br/>The change will take effect immediately.", + "status_link": "Click to ${action}" } }, "password": { @@ -363,6 +355,13 @@ "truncated": "Query returned more results than the configured size limit. Displaying the first ${counter} results.", "unselect_all": "Unselect All" }, + "status": { + "disable": "Disable", + "disabled": "Disabled", + "enable": "Enable", + "enabled": "Enabled", + "label": "Status" + }, "tabs": { "audit": "Audit", "automount": "Automount", |