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/05/04 15:13:24 UTC
svn commit: r535228 - in /lenya/trunk/src/modules-core/workflow:
java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml usecases/publish.jx
Author: andreas
Date: Fri May 4 06:13:23 2007
New Revision: 535228
URL: http://svn.apache.org/viewvc?view=rev&rev=535228
Log:
Added i18n for scheduler messages, fixed publish form flow when errors occur
Modified:
lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml
lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml
lenya/trunk/src/modules-core/workflow/usecases/publish.jx
Modified: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java?view=diff&rev=535228&r1=535227&r2=535228
==============================================================================
--- lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java Fri May 4 06:13:23 2007
@@ -242,6 +242,20 @@
return link;
}
+ protected void doCheckExecutionConditions() throws Exception {
+ super.doCheckExecutionConditions();
+ boolean schedule = Boolean.valueOf(getBooleanCheckboxParameter(SCHEDULE)).booleanValue();
+ if (schedule) {
+ String dateString = getParameterAsString(SCHEDULE_TIME);
+ DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ format.parse(dateString);
+ } catch (ParseException e) {
+ addErrorMessage("scheduler-date-format-invalid");
+ }
+ }
+ }
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
@@ -254,16 +268,11 @@
DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
UsecaseScheduler scheduler = null;
try {
- Date date = null;
- try {
- date = format.parse(dateString);
- } catch (ParseException e) {
- addErrorMessage("The scheduler date must be of the form 'yyyy-MM-dd HH:mm:ss'.");
- }
- if (date != null) {
- scheduler = (UsecaseScheduler) this.manager.lookup(UsecaseScheduler.ROLE);
- scheduler.schedule(this, date);
- }
+ Date date = format.parse(dateString);
+ scheduler = (UsecaseScheduler) this.manager.lookup(UsecaseScheduler.ROLE);
+ scheduler.schedule(this, date);
+ } catch (ParseException e) {
+ addErrorMessage("scheduler-date-format-invalid");
} finally {
if (scheduler != null) {
this.manager.release(scheduler);
Modified: lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml?view=diff&rev=535228&r1=535227&r2=535228
==============================================================================
--- lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml Fri May 4 06:13:23 2007
@@ -45,5 +45,6 @@
<message key="publish-broken-links">The document contains broken links.</message>
<message key="notify-reviewers">Notify reviewers</message>
+ <message key="scheduler-date-format-invalid">The scheduler date must be of the form 'yyyy-MM-dd HH:mm:ss'.</message>
</catalogue>
Modified: lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml?view=diff&rev=535228&r1=535227&r2=535228
==============================================================================
--- lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml Fri May 4 06:13:23 2007
@@ -45,6 +45,7 @@
<message key="publish-broken-links">Das Dokument enthält Links zu nicht existierenden Dokumenten.</message>
<message key="notify-reviewers">Prüfer benachrichtigen</message>
+ <message key="scheduler-date-format-invalid">Das Zeitsteuerungs-Datum muss der Form 'yyyy-MM-dd HH:mm:ss' entsprechen.</message>
</catalogue>
Modified: lenya/trunk/src/modules-core/workflow/usecases/publish.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/usecases/publish.jx?view=diff&rev=535228&r1=535227&r2=535228
==============================================================================
--- lenya/trunk/src/modules-core/workflow/usecases/publish.jx (original)
+++ lenya/trunk/src/modules-core/workflow/usecases/publish.jx Fri May 4 06:13:23 2007
@@ -108,11 +108,11 @@
</td>
<td>
<jx:choose>
- <jx:when test="${usecase.getParameter('sendNotification').equals('true')}">
- <input name="sendNotification" type="checkbox"/>
+ <jx:when test="${usecase.getBooleanCheckboxParameter('sendNotification').equals('true')}">
+ <input name="sendNotification" type="checkbox" checked="checked"/>
</jx:when>
<jx:otherwise>
- <input name="sendNotification" type="checkbox" checked="checked"/>
+ <input name="sendNotification" type="checkbox"/>
</jx:otherwise>
</jx:choose>
</td>
@@ -120,14 +120,21 @@
<tr>
<td class="lenya-entry-caption"><i18n:text>Schedule</i18n:text>:</td>
<td>
- <input type="checkbox" name="schedule"/>
+ <jx:choose>
+ <jx:when test="${usecase.getBooleanCheckboxParameter('schedule').equals('true')}">
+ <input type="checkbox" name="schedule" checked="checked"/>
+ </jx:when>
+ <jx:otherwise>
+ <input type="checkbox" name="schedule"/>
+ </jx:otherwise>
+ </jx:choose>
<input type="text" name="schedule.time" value="${usecase.getParameter('schedule.time')}"/>
</td>
</tr>
<tr>
<td/>
<td>
- <jx:if test="${!usecase.hasErrors()}">
+ <jx:if test="${!usecase.hasErrors() || cocoon.request.getParameter('submit') != null}">
<input i18n:attr="value" type="submit" name="submit" value="Publish"/>
 
</jx:if>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org