diff options
| author | Adam Young <ayoung@redhat.com> | 2010-11-08 20:39:40 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2010-11-09 02:14:23 -0500 |
| commit | 1f9531bea203e7c4706ec5607fcb3c3111436373 (patch) | |
| tree | 454012b65f8d39744da18b509ee92ca2bd4dc461 | |
| parent | cb739c10d04beaa1470e509b9236f33a16c83408 (diff) | |
| download | freeipa-1f9531bea203e7c4706ec5607fcb3c3111436373.tar.gz freeipa-1f9531bea203e7c4706ec5607fcb3c3111436373.tar.xz freeipa-1f9531bea203e7c4706ec5607fcb3c3111436373.zip | |
delete to remove THe keyword delete is reserved in Javascript Using it breaks the WebUI on Chrome. This fixes replaces the word with delete.
| -rw-r--r-- | install/static/associate.js | 2 | ||||
| -rw-r--r-- | install/static/policy.js | 4 | ||||
| -rw-r--r-- | install/static/search.js | 4 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/install/static/associate.js b/install/static/associate.js index a25144ef9..be9ee582c 100644 --- a/install/static/associate.js +++ b/install/static/associate.js @@ -264,7 +264,7 @@ function ipa_association_widget(spec) { $('<input/>', { 'type': 'button', 'name': 'remove', - 'value': IPA.messages.button.delete + 'value': IPA.messages.button.remove }).appendTo(buttons); $('<input/>', { diff --git a/install/static/policy.js b/install/static/policy.js index 24333a5db..c5ca523a9 100644 --- a/install/static/policy.js +++ b/install/static/policy.js @@ -179,7 +179,7 @@ function ipa_records_facet(spec){ var delete_dialog = $('<div/>', { - title: IPA.messages.button.delete + title: IPA.messages.button.remove }); var to_delete_table = $('<table class="search-table" >'+ @@ -302,7 +302,7 @@ function ipa_records_facet(spec){ }).appendTo(control_span); ipa_button({ - 'label': IPA.messages.button.delete, + 'label': IPA.messages.button.remove, 'icon': 'ui-icon-trash', 'click': function(){delete_records(records_table);} }).appendTo(control_span); diff --git a/install/static/search.js b/install/static/search.js index dafa7a553..1dfeda41e 100644 --- a/install/static/search.js +++ b/install/static/search.js @@ -144,7 +144,7 @@ function search_create(entity_name, columns, container) { function delete_on_click_outer() { var delete_list = []; var delete_dialog = $('<div></div>', { - title: IPA.messages.button.delete + title: IPA.messages.button.remove }); function delete_on_click() { @@ -213,7 +213,7 @@ function search_create(entity_name, columns, container) { }).appendTo(search_filter); ipa_button({ - 'label': IPA.messages.button.delete, + 'label': IPA.messages.button.remove, 'icon': 'ui-icon-trash', 'click': delete_on_click_outer }).appendTo(search_filter); diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index bf477b74b..f1a16c987 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -43,7 +43,7 @@ class json_metadata(Command): "reset":_("Reset"), "update":_("Update"), "enroll":_("Enroll"), - "delete":_("Delete"), + "remove":_("Delete"), }, "search":{ "quick_links":_("Quick Links"), |