Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-4174] Redirect back to queue overview after delete/moving message 

Patch from Robert Balent applied
This commit is contained in:
Daniel Kulp 2014-02-05 15:19:44 -05:00
parent 146fb12108
commit 3321f99643
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
View File

@ -49,7 +49,7 @@ public class CopyMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName()); log.warn("No queue named: " + getPhysicalDestinationName());
} }
} }
return redirectToBrowseView(); return redirectToDestinationView();
} }
public String getMessageId() { public String getMessageId() {

2
activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
View File

@ -48,7 +48,7 @@ public class DeleteMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName()); log.warn("No queue named: " + getPhysicalDestinationName());
} }
} }
return redirectToBrowseView(); return redirectToDestinationView();
} }
public String getMessageId() { public String getMessageId() {

2
activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
View File

@ -49,7 +49,7 @@ public class MoveMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName()); log.warn("No queue named: " + getPhysicalDestinationName());
} }
} }
return redirectToBrowseView(); return redirectToDestinationView();
} }
public String getMessageId() { public String getMessageId() {

6
activemq-web-console/src/main/webapp/message.jsp
View File

@ -133,10 +133,10 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td colspan="2"><a href="deleteMessage.action?JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a></td> <td colspan="2"><a href="deleteMessage.action?JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a></td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<td><a href="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Copy</a></td> <td><a href="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Copy</a></td>
<td rowspan="2"> <td rowspan="2">
<select id="queue"> <select id="queue">
<option value=""> -- Please select --</option> <option value=""> -- Please select --</option>
@ -150,7 +150,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</tr> </tr>
<tr class="odd"> <tr class="odd">
<td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Move</a></td> <td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Move</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

4
activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
View File

@ -128,6 +128,10 @@ public class DestinationFacade {
return new ModelAndView("redirect:" + (isQueue() ? "queues.jsp" : "topics.jsp")); return new ModelAndView("redirect:" + (isQueue() ? "queues.jsp" : "topics.jsp"));
} }
protected ModelAndView redirectToDestinationView() {
return new ModelAndView("redirect:browse.jsp?JMSDestination=" + jmsDestination);
}
protected String getPhysicalDestinationName() { protected String getPhysicalDestinationName() {
return createDestination().getPhysicalName(); return createDestination().getPhysicalName();
} }