diff options
Diffstat (limited to 'install/ui')
-rw-r--r-- | install/ui/src/freeipa/association.js | 33 | ||||
-rw-r--r-- | install/ui/src/freeipa/search.js | 4 | ||||
-rw-r--r-- | install/ui/src/freeipa/sudo.js | 14 | ||||
-rw-r--r-- | install/ui/test/data/ipa_init.json | 12 |
4 files changed, 47 insertions, 16 deletions
diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js index 71ee71d48..2921849d2 100644 --- a/install/ui/src/freeipa/association.js +++ b/install/ui/src/freeipa/association.js @@ -1025,10 +1025,22 @@ IPA.association_facet = function (spec, no_init) { other_entity: that.other_entity, values: dialog.get_selected_values(), method: that.add_method, - on_success: function() { + on_success: function(data) { that.refresh(); dialog.close(); - IPA.notify_success('@i18n:association.added'); + var succeeded = data.result.completed; + + if (!succeeded) { + succeeded = 0; + for (var i = 0; i< data.result.results.length; i++) { + if (data.result.results[i].completed === 1) { + succeeded++; + } + } + } + + var msg = text.get('@i18n:association.added').replace('${count}', succeeded); + IPA.notify_success(msg); }, on_error: function() { that.refresh(); @@ -1077,9 +1089,22 @@ IPA.association_facet = function (spec, no_init) { other_entity: that.other_entity, values: values, method: that.remove_method, - on_success: function() { + on_success: function(data) { that.refresh(); - IPA.notify_success('@i18n:association.removed'); + + var succeeded = data.result.completed; + + if (!succeeded) { + succeeded = 0; + for (var i = 0; i< data.result.results.length; i++) { + if (data.result.results[i].completed === 1) { + succeeded++; + } + } + } + + var msg = text.get('@i18n:association.removed').replace('${count}', succeeded); + IPA.notify_success(msg); }, on_error: function() { that.refresh(); diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js index 8af5a29d3..a77f1768c 100644 --- a/install/ui/src/freeipa/search.js +++ b/install/ui/src/freeipa/search.js @@ -337,7 +337,9 @@ IPA.search_deleter_dialog = function(spec) { batch.on_success = function(data, text_status, xhr) { that.facet.refresh(); that.facet.on_update.notify([],that.facet); - IPA.notify_success('@i18n:search.deleted'); + var succeeded = batch.commands.length - batch.errors.errors.length; + var msg = text.get('@i18n:search.deleted').replace('${count}', succeeded); + IPA.notify_success(msg); }; batch.on_error = function() { diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js index 638b2380f..cb620e41b 100644 --- a/install/ui/src/freeipa/sudo.js +++ b/install/ui/src/freeipa/sudo.js @@ -881,18 +881,22 @@ IPA.sudo.options_section = function(spec) { on_success: function(data) { //last successful result of batch results contains valid data var result; - for(var i = data.result.results.length - 1; i > -1; i--) { - result = data.result.results[i].result; - if(result) break; + var succeeded = 0; + + for (var i = data.result.results.length - 1; i > -1; i--) { + var error = data.result.results[i].error; + if (!result) result = data.result.results[i].result; + if (!error) succeeded++; } - if(result) { + if (result) { that.table.load(result); } else { that.reload(); } - IPA.notify_success('@i18n:objects.sudorule.option_removed'); + var msg = text.get('@i18n:objects.sudorule.option_removed').replace('${count}', succeeded); + IPA.notify_success(msg); }, on_error: function(data) { that.reload(); diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index d025f6958..122dd17fb 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -31,7 +31,7 @@ "memberof": "Add ${entity} ${primary_key} into ${other_entity}", "sourcehost": "Add Source ${other_entity} into ${entity} ${primary_key}" }, - "added": "Items added", + "added": "${count} item(s) added", "direct_membership": "Direct Membership", "indirect_membership": "Indirect Membership", "no_entries": "No entries.", @@ -46,7 +46,7 @@ "memberof": "Remove ${entity} ${primary_key} from ${other_entity}", "sourcehost": "Remove Source ${other_entity} from ${entity} ${primary_key}" }, - "removed": "Items removed", + "removed": "${count} item(s) removed", "show_results": "Show Results" }, "buttons": { @@ -465,7 +465,7 @@ "host": "Access this host", "ipaenabledflag": "Rule status", "option_added": "Option added", - "option_removed": "Option(s) removed", + "option_removed": "${count} option(s) removed", "options": "Options", "runas": "As Whom", "specified_commands": "Specified Commands and Groups", @@ -521,11 +521,11 @@ }, "search": { "delete_confirm": "Are you sure you want to delete selected entries?", - "deleted": "Selected entries were deleted.", + "deleted": "${count} item(s) deleted", "disable_confirm": "Are you sure you want to disable selected entries?", - "disabled": "${count} items were disabled", + "disabled": "${count} item(s) disabled", "enable_confirm": "Are you sure you want to enable selected entries?", - "enabled": "${count} items were enabled", + "enabled": "${count} item(s) enabled", "partial_delete": "Some entries were not deleted", "quick_links": "Quick Links", "select_all": "Select All", |