You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/09 20:27:45 UTC
svn commit: r505436 - in /lenya/trunk/src/modules/notification:
java/src/org/apache/lenya/inbox/usecases/Inbox.java
usecases/currentMessage.jx usecases/messageList.jx
Author: andreas
Date: Fri Feb 9 11:27:44 2007
New Revision: 505436
URL: http://svn.apache.org/viewvc?view=rev&rev=505436
Log:
Allow to delete messages from inbox, improved usecase behaviour
Modified:
lenya/trunk/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java
lenya/trunk/src/modules/notification/usecases/currentMessage.jx
lenya/trunk/src/modules/notification/usecases/messageList.jx
Modified: lenya/trunk/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java?view=diff&rev=505436&r1=505435&r2=505436
==============================================================================
--- lenya/trunk/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java (original)
+++ lenya/trunk/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java Fri Feb 9 11:27:44 2007
@@ -46,18 +46,28 @@
this.manager.release(inboxManager);
}
}
-
}
+
+ protected void doCheckPreconditions() throws Exception {
+ super.doCheckPreconditions();
- protected void doExecute() throws Exception {
- super.doExecute();
-
String id = getParameterAsString("messageId");
if (id != null) {
org.apache.lenya.inbox.Inbox inbox = (org.apache.lenya.inbox.Inbox) getParameter("inbox");
InboxMessage message = inbox.getMessage(id);
message.markAsRead(true);
- setExitParameter("messageId", id);
+ }
+
+ }
+
+ protected void doExecute() throws Exception {
+ super.doExecute();
+
+ String deleteId = getParameterAsString("deleteMessageId");
+ if (deleteId != null) {
+ org.apache.lenya.inbox.Inbox inbox = (org.apache.lenya.inbox.Inbox) getParameter("inbox");
+ InboxMessage message = inbox.getMessage(deleteId);
+ inbox.remove(message);
}
}
Modified: lenya/trunk/src/modules/notification/usecases/currentMessage.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/notification/usecases/currentMessage.jx?view=diff&rev=505436&r1=505435&r2=505436
==============================================================================
--- lenya/trunk/src/modules/notification/usecases/currentMessage.jx (original)
+++ lenya/trunk/src/modules/notification/usecases/currentMessage.jx Fri Feb 9 11:27:44 2007
@@ -60,6 +60,18 @@
</i18n:translate>
</td>
</tr>
+ <tr>
+ <td/>
+ <td>
+ <br/>
+ <form method="POST">
+ <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <input type="hidden" name="deleteMessageId" value="${messageId}"/>
+ <input type="submit" name="submit" value="Delete" i18n:attr="value"/>
+ </form>
+ </td>
+ </tr>
</table>
</div>
</div>
Modified: lenya/trunk/src/modules/notification/usecases/messageList.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/notification/usecases/messageList.jx?view=diff&rev=505436&r1=505435&r2=505436
==============================================================================
--- lenya/trunk/src/modules/notification/usecases/messageList.jx (original)
+++ lenya/trunk/src/modules/notification/usecases/messageList.jx Fri Feb 9 11:27:44 2007
@@ -38,31 +38,27 @@
<jx:set var="class" value="highlight"/>
</jx:if>
- <form method="POST">
- <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
- <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
- <tr class="${class}">
- <td>
- <a href="?lenya.usecase=notification.inbox&messageId=${message.getId()}&lenya.continuation=${continuation.id}&submit=Submit">
- <i18n:translate>
- <i18n:text><jx:out value="${message.getMessage().getSubject()}"/></i18n:text>
- <jx:forEach var="param" items="${message.getMessage().getSubjectParameters()}">
- <i18n:param><jx:out value="${param}"/></i18n:param>
- </jx:forEach>
- </i18n:translate>
- </a>
- </td>
- <td>
- <a href="?lenya.usecase=admin.user&userId=${message.getMessage().getSender().getId()}"><jx:out value="${message.getMessage().getSender().getId()}"/></a>
- </td>
- <td>
- <jx:formatDate pattern="yyyy-MM-dd HH:mm:ss" value="${message.getMessage().getTime()}"/>
- </td>
- <td style="text-align: center;">
- <jx:if test="${message.isMarkedAsRead()}">✔</jx:if>
- </td>
- </tr>
- </form>
+ <tr class="${class}">
+ <td>
+ <a href="?lenya.usecase=notification.inbox&messageId=${message.getId()}">
+ <i18n:translate>
+ <i18n:text><jx:out value="${message.getMessage().getSubject()}"/></i18n:text>
+ <jx:forEach var="param" items="${message.getMessage().getSubjectParameters()}">
+ <i18n:param><jx:out value="${param}"/></i18n:param>
+ </jx:forEach>
+ </i18n:translate>
+ </a>
+ </td>
+ <td>
+ <a href="?lenya.usecase=admin.user&userId=${message.getMessage().getSender().getId()}"><jx:out value="${message.getMessage().getSender().getId()}"/></a>
+ </td>
+ <td>
+ <jx:formatDate pattern="yyyy-MM-dd HH:mm:ss" value="${message.getMessage().getTime()}"/>
+ </td>
+ <td style="text-align: center;">
+ <jx:if test="${message.isMarkedAsRead()}">✔</jx:if>
+ </td>
+ </tr>
</jx:forEach>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org