svn commit: r1617017 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java resources/ApplicationResources.properties webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp

[gm...@apache.org]

Author: gmazza
Date: Sat Aug  9 20:52:36 2014
New Revision: 1617017

URL: http://svn.apache.org/r1617017
Log:
Cleanup of ping target remove screen.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java?rev=1617017&r1=1617016&r2=1617017&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java Sat Aug  9 20:52:36 2014
@@ -159,9 +159,7 @@ public class PingTargets extends UIActio
      * Delete a ping target.
      */
     public String delete() {
-
         if(getPingTarget() != null) {
-
             try {
                 PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
                 pingTargetMgr.removePingTarget(getPingTarget());
@@ -169,17 +167,14 @@ public class PingTargets extends UIActio
 
                 // remove deleted target from list
                 getPingTargets().remove(getPingTarget());
-
-                addMessage("pingTarget.successfullyDeleted", getPingTarget().getName());
-
+                addMessage("pingTarget.deleted", getPingTarget().getName());
             } catch (WebloggerException ex) {
                 log.error("Error deleting ping target - " + getPingTargetId(), ex);
-                addError("pingTarget.errorDeleting", getPingTargetId());
+                addError("generic.error.check.logs", getPingTargetId());
             }
         } else {
             addError("pingTarget.notFound", getPingTargetId());
         }
-
         return LIST;
     }
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1617017&r1=1617016&r2=1617017&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Aug  9 20:52:36 2014
@@ -1091,6 +1091,7 @@ pingTarget.manual=Manual
 pingTarget.sendPingNow=Send Ping Now
 pingTarget.updated=Ping target "{0}" updated
 pingTarget.created=Ping target "{0}" created
+pingTarget.deleted=Ping target "{0}" deleted
 pingTarget.saved.error=Error updating ping target.
 
 pingTarget.nameNotUnique=Target name already exists, please choose another.
@@ -1100,8 +1101,6 @@ pingTarget.malformedUrl=The URL is not p
 pingTarget.unknownHost=The hostname in this URL doesn''t seem to exist.
 pingTarget.unspecified=No ping target id was specified in the request
 pingTarget.notFound=Ping target id {0} was not found
-pingTarget.errorDeleting=Error deleting ping target id {0}
-pingTarget.successfullyDeleted=Successfully deleted ping target {0}
 
 # --------------------------------------------------------------- Planet Roller
 

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp?rev=1617017&r1=1617016&r2=1617017&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp Sat Aug  9 20:52:36 2014
@@ -17,8 +17,9 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
-<br />
-<h1><s:text name="" /></h1>
+<h2>
+    <s:text name="pingTarget.confirmRemoveTitle"/>
+</h2>
 
 <p/>
 <s:text name="pingTarget.confirmCommonRemove" />
@@ -32,14 +33,10 @@
 <br/>
 
 <div class="control">
-    <s:form action="commonPingTargets!delete">
+    <s:form>
 		<s:hidden name="salt" />
         <s:hidden name="pingTargetId" />
-        <s:submit value="%{getText('generic.yes')}" />
-    </s:form>
-    &nbsp;
-    <s:form action="commonPingTargets">
-		<s:hidden name="salt" />
-        <s:submit value="%{getText('generic.cancel')}" />
+        <s:submit value="%{getText('generic.yes')}" action="commonPingTargets!delete"/>
+        <s:submit value="%{getText('generic.cancel')}" action="commonPingTargets"/>
     </s:form>
 </div>