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/04/16 16:14:47 UTC
svn commit: r529255 - in /lenya/trunk/src:
modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/
modules-core/sitemanagement/resources/i18n/
modules-core/sitemanagement/usecases/site/ webapp/lenya/resources/i18n/
Author: andreas
Date: Mon Apr 16 07:14:45 2007
New Revision: 529255
URL: http://svn.apache.org/viewvc?view=rev&rev=529255
Log:
Make navigation title mandatory. This fixes bug 42060. Thanks to Richard Frovarp for the patch. Added some i18n messages.
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml
lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml
lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx
lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java?view=diff&rev=529255&r1=529254&r2=529255
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java Mon Apr 16 07:14:45 2007
@@ -85,13 +85,24 @@
}
/**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+ */
+ protected void doCheckExecutionConditions() throws Exception {
+ String label = getParameterAsString(LABEL);
+ if (label.trim().equals("")) {
+ addErrorMessage("missing-navigation-title");
+ }
+ }
+
+
+ /**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
protected void doExecute() throws Exception {
super.doExecute();
Document document = getSourceDocument();
- String label = getParameterAsString(LABEL);
+ String label = getParameterAsString(LABEL).trim();
document.getLink().setLabel(label);
WorkflowUtil.invoke(this.manager, getSession(), getLogger(), document, getEvent());
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java?view=diff&rev=529255&r1=529254&r2=529255
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java Mon Apr 16 07:14:45 2007
@@ -106,22 +106,23 @@
*/
protected void doCheckExecutionConditions() throws Exception {
String navigationTitle = getDublinCoreParameter(DublinCore.ELEMENT_TITLE);
- if (navigationTitle.equals("")) {
- addErrorMessage("The navigation title is required.");
+ if (navigationTitle.trim().equals("")) {
+ addErrorMessage("missing-navigation-title");
}
if (getInitialDocument() == null) {
String[] samples = (String[]) getParameter(SAMPLES);
String sample = getParameterAsString(SAMPLE);
if (samples != null && samples.length > 1 && (sample == null || sample.equals(""))) {
- addErrorMessage("Please select a page layout.");
+ addErrorMessage("missing-page-layout");
}
}
String path = getNewDocumentPath();
SiteStructure site = getPublication().getArea(getArea()).getSite();
if (!createVersion() && site.contains(path)) {
- addErrorMessage("The path [" + path + "] already exists!");
+ String[] params = { path };
+ addErrorMessage("path-already-exists", params);
}
String doctypeName = getDocumentTypeName();
@@ -149,7 +150,7 @@
Document document;
- String title = getDublinCoreParameter(DublinCore.ELEMENT_TITLE);
+ String title = getDublinCoreParameter(DublinCore.ELEMENT_TITLE).trim();
if (createVersion()) {
document = documentManager.addVersion(initialDocument, getArea(), language, true);
Modified: lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml?view=diff&rev=529255&r1=529254&r2=529255
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml Mon Apr 16 07:14:45 2007
@@ -42,5 +42,8 @@
<message key="New subtree credential">New subtree credential</message>
<message key="no-jobs-scheduled">No jobs scheduled.</message>
<message key="No overview available.">No overview available.</message>
+ <message key="missing-navigation-title">Please enter a navigation title.</message>
+ <message key="missing-page-layout">Please select a page layout.</message>
+ <message key="path-already-exists">The path {0} already exists.</message>
</catalogue>
Modified: lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml?view=diff&rev=529255&r1=529254&r2=529255
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml Mon Apr 16 07:14:45 2007
@@ -42,6 +42,9 @@
<message key="New subtree credential">Neue Berechtigung für diesen Teilbaum</message>
<message key="no-jobs-scheduled">Es wurden keine zeitgesteuerten Aktionen gestartet.</message>
<message key="No overview available.">Es ist keine Ãbersicht verfügbar.</message>
+ <message key="missing-navigation-title">Bitte geben Sie einen Navigationstitel ein.</message>
+ <message key="missing-page-layout">Bitte wählen Sie ein Seiten-Layout.</message>
+ <message key="path-already-exists">Der Pfad {0} existiert bereits.</message>
</catalogue>
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx?view=diff&rev=529255&r1=529254&r2=529255
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx Mon Apr 16 07:14:45 2007
@@ -32,9 +32,9 @@
<i18n:translate>
<i18n:text key="rename-label-doc"/>
<i18n:param>
- <q>
- <jx:out value="${usecase.getParameter('document').getId()}"/>
- </q>
+ <q><jx:out value="${usecase.getParameter('document')
+ .getMetaData('http://purl.org/dc/elements/1.1/')
+ .getFirstValue('title')}"/></q>
</i18n:param>
</i18n:translate>
</div>
Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml?view=diff&rev=529255&r1=529254&r2=529255
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Mon Apr 16 07:14:45 2007
@@ -257,7 +257,7 @@
<message key="Scheduler">Zeitsteuerung</message>
<!-- Info screen actions-->
- <message key="New Navigation Title">Neuer Titel</message>
+ <message key="New Navigation Title">Neuer Navigationstitel</message>
<message key="rename-document">Dokument {0} umbenennen</message>
<message key="New Document ID">Neue Dokument ID</message>
<message key="No whitespace, no special characters">Keine Leer- oder Sonderzeichen</message>
@@ -290,7 +290,7 @@
<!--Rename document -->
<message key="Rename Document">Dokument umbenennen</message>
<message key="rename-doc">Dokument {0} umbenennen</message>
- <message key="rename-label-doc">Navigationstitel von Dokument {0} ändern</message>
+ <message key="rename-label-doc">Navigationstitel des Dokuments {0} ändern</message>
<!-- Copy document -->
<message key="Copy Document">Dokument kopieren</message>
<message key="copy-doc">Kopieren von Dokument {0}</message>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org