java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java | 20 ++++++++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 14 +++++++ 2 files changed, 30 insertions(+), 4 deletions(-)
New commits: commit d6154126713e3dde5a313c5ff8883ff0ff6f4aa7 Author: Tomas Lestach tlestach@redhat.com Date: Mon Oct 3 11:37:18 2011 +0200
add exception handling for server deletion
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java index 233e109..c16a947 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java @@ -77,10 +77,22 @@ public class SystemDeleteConfirmAction extends RhnAction { } }
- // Now we can remove the system - SystemManager.deleteServer(loggedInUser, sid); - - createSuccessMessage(request, "message.serverdeleted", sid.toString()); + try { + // Now we can remove the system + SystemManager.deleteServer(loggedInUser, sid); + createSuccessMessage(request, "message.serverdeleted.param", + sid.toString()); + } + catch (RuntimeException e) { + if (e.getMessage().contains("cobbler")) { + createErrorMessage(request, "message.servernotdeleted_cobbler", + sid.toString()); + } + else { + createErrorMessage(request, "message.servernotdeleted", sid.toString()); + throw e; + } + }
forward = strutsDelegate.forwardParams(mapping.findForward("success"), params); } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index f38e0e6..6a840cf 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -4031,6 +4031,20 @@ user before attempting to deactivate their account.</source> </context-group> </trans-unit>
+ <trans-unit id="message.servernotdeleted"> +<source>System profile {0} could not be deleted.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/Overview</context> + </context-group> + </trans-unit> + + <trans-unit id="message.servernotdeleted_cobbler"> +<source>System profile {0} could not be deleted. Check cobbler service.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/Overview</context> + </context-group> + </trans-unit> + <trans-unit id="message.ssm.serverdeleted"> <source>Deleted <strong>{0}</strong> system from the System Set Manager.</source> <context-group name="ctx">
spacewalk-commits@lists.fedorahosted.org