You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ed...@apache.org on 2005/02/09 18:13:58 UTC
svn commit: r153089 - in lenya/branches/BRANCH_1_2_X/src/webapp/lenya:
content/publishing/screen.xsp content/scheduler/screen.xsp
xslt/publishing/publish-screen.xsl xslt/scheduler/screen.xsl
Author: edith
Date: Wed Feb 9 09:13:56 2005
New Revision: 153089
URL: http://svn.apache.org/viewcvs?view=rev&rev=153089
Log:
set the date of publication, the publisher and the date of modification when a document is published: user-name and user-email parameters needed; check if the document can be checkout
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/scheduler/screen.xsp
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/publishing/publish-screen.xsl
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/scheduler/screen.xsl
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp?view=diff&r1=153088&r2=153089
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp Wed Feb 9 09:13:56 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: screen.xsp,v 1.19 2004/07/29 05:50:14 michi Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -39,6 +39,8 @@
<xsp:include>org.apache.lenya.cms.workflow.WorkflowFactory</xsp:include>
<xsp:include>org.apache.lenya.workflow.impl.History</xsp:include>
<xsp:include>org.apache.lenya.workflow.impl.Version</xsp:include>
+ <xsp:include>org.apache.lenya.cms.rc.RevisionController</xsp:include>
+ <xsp:include>org.apache.lenya.cms.rc.RCEnvironment</xsp:include>
</xsp:structure>
<usecase:publish>
@@ -53,6 +55,8 @@
<usecase:language><input:get-attribute module="page-envelope" name="document-language" as="string"/></usecase:language>
<usecase:referer><input:get-attribute module="request" name="requestURI" as="string"/></usecase:referer>
<usecase:user-id><input:get-attribute module="access-control" name="user-id" as="string"/></usecase:user-id>
+ <usecase:user-name><input:get-attribute module="access-control" name="user-name" as="string"/></usecase:user-name>
+ <usecase:user-email><input:get-attribute module="access-control" name="user-email" as="string"/></usecase:user-email>
<usecase:ip-address><input:get-attribute module="access-control" name="ip-address" as="string"/></usecase:ip-address>
<usecase:role-ids><input:get-attribute module="access-control" name="role-ids" as="string"/></usecase:role-ids>
<usecase:workflow-event><input:get-attribute module="request-param" name="lenya.event" as="string"/></usecase:workflow-event>
@@ -152,6 +156,29 @@
}
</xsp:logic>
+ <xsp:logic>
+ try {
+ Publication publication = (Publication)<input:get-attribute module="page-envelope" as="object" name="publication"/>;
+ String userId = <input:get-attribute module="access-control" name="user-id" as="string"/>;
+
+ RCEnvironment rcEnvironment = RCEnvironment.getInstance(publication.getServletContext().getAbsolutePath());
+ String rootDir=publication.getEnvironment().getPublicationPath();
+ String rcmlDirectory = rcEnvironment.getRCMLDirectory();
+ rcmlDirectory=rootDir+rcmlDirectory;
+ String backupDirectory = rcEnvironment.getBackupDirectory();
+ backupDirectory=rootDir+backupDirectory;
+ RevisionController rc = new RevisionController(rcmlDirectory, backupDirectory, rootDir);
+
+ Document document = (Document) <input:get-attribute module="page-envelope" as="object" name="document"/>;
+ String filename = document.getFile().getCanonicalPath().substring(publication.getDirectory().getCanonicalPath().length());
+ if (!rc.canCheckOut(filename, userId)) {
+ <usecase:message id="not-check-out"/>
+ }
+ }
+ catch (Exception e) {
+ throw new ProcessingException(e);
+ }
+ </xsp:logic>
</usecase:publish>
</xsp:page>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/scheduler/screen.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/scheduler/screen.xsp?view=diff&r1=153088&r2=153089
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/scheduler/screen.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/scheduler/screen.xsp Wed Feb 9 09:13:56 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: screen.xsp,v 1.3 2004/03/13 12:31:31 gregor Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -51,6 +51,8 @@
<usecase:referer><input:get-attribute module="request" name="requestURI" as="string"/></usecase:referer>
<usecase:user-id><input:get-attribute module="access-control" name="user-id" as="string"/></usecase:user-id>
+ <usecase:user-name><input:get-attribute module="access-control" name="user-name" as="string"/></usecase:user-name>
+ <usecase:user-email><input:get-attribute module="access-control" name="user-email" as="string"/></usecase:user-email>
<usecase:ip-address><input:get-attribute module="access-control" name="ip-address" as="string"/></usecase:ip-address>
<usecase:role-ids><input:get-attribute module="access-control" name="role-ids" as="string"/></usecase:role-ids>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/publishing/publish-screen.xsl
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/publishing/publish-screen.xsl?view=diff&r1=153088&r2=153089
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/publishing/publish-screen.xsl (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/publishing/publish-screen.xsl Wed Feb 9 09:13:56 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: publish-screen.xsl,v 1.19 2004/07/29 05:50:14 michi Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -70,13 +70,13 @@
</td>
</tr>
<tr>
- <td valign="top" class="lenya-entry-caption">Problem:</td>
+ <td valign="top" class="lenya-entry-caption">Problem(s):</td>
<td>
- <span class="lenya-form-error">This page cannot be published unless its parent is
- published:</span>
- <ul>
- <li><xsl:apply-templates select="usecase:parent"/></li>
- </ul>
+ <span class="lenya-form-error">This page cannot be published : </span>
+ <ol>
+ <xsl:apply-templates select="usecase:message[@id='not-check-out']"/>
+ <xsl:apply-templates select="usecase:parent"/>
+ </ol>
</td>
</tr>
<tr>
@@ -93,11 +93,20 @@
</page:page>
</xsl:template>
-
<xsl:template match="usecase:parent">
- <a href="{@href}"><xsl:value-of select="@id"/> [<xsl:value-of select="@language"/>]</a>
+ <li>
+ <span class="lenya-form-error">unless its parent is published:</span>
+ <ul>
+ <li><a href="{@href}"><xsl:value-of select="@id"/> [<xsl:value-of select="@language"/>]</a></li>
+ </ul>
+ </li>
</xsl:template>
+ <xsl:template match="usecase:message[@id='not-check-out']">
+ <li>
+ <span class="lenya-form-error">because it is checked out by another user</span>
+ </li>
+ </xsl:template>
<xsl:template match="/usecase:publish[not(usecase:message)]">
@@ -113,6 +122,8 @@
<input type="hidden" name="document-id" value="{$document-id}"/>
<input type="hidden" name="document-language" value="{$document-language}"/>
<input type="hidden" name="user-id" value="{/usecase:publish/usecase:user-id}"/>
+ <input type="hidden" name="user-name" value="{/usecase:publish/usecase:user-name}"/>
+ <input type="hidden" name="user-email" value="{/usecase:publish/usecase:user-email}"/>
<input type="hidden" name="ip-address" value="{/usecase:publish/usecase:ip-address}"/>
<input type="hidden" name="role-ids" value="{/usecase:publish/usecase:role-ids}"/>
<input type="hidden" name="workflow-event" value="publish"/>
@@ -145,7 +156,7 @@
</td>
</tr>
<tr>
- <xsl:apply-templates select="referenced-documents"/>
+ <xsl:apply-templates select="referenced-documents"/>
</tr>
<tr>
<td/>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/scheduler/screen.xsl
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/scheduler/screen.xsl?view=diff&r1=153088&r2=153089
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/scheduler/screen.xsl (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/scheduler/screen.xsl Wed Feb 9 09:13:56 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: screen.xsl,v 1.5 2004/04/29 14:24:08 gregor Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -88,6 +88,8 @@
<input type="hidden" name="document-id" value="{/usecase:schedule/usecase:document-id}"/>
<input type="hidden" name="document-language" value="{/usecase:schedule/usecase:document-language}"/>
<input type="hidden" name="user-id" value="{/usecase:schedule/usecase:user-id}"/>
+ <input type="hidden" name="user-name" value="{/usecase:schedule/usecase:user-name}"/>
+ <input type="hidden" name="user-email" value="{/usecase:schedule/usecase:user-email}"/>
<input type="hidden" name="ip-address" value="{/usecase:schedule/usecase:ip-address}"/>
<input type="hidden" name="role-ids" value="{/usecase:schedule/usecase:role-ids}"/>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org