svn commit: r615291 - in /lenya/trunk/src/modules-core: sitemanagement/usecases/tab/scheduler.jx usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java

Author: rfrovarp
Date: Fri Jan 25 10:06:50 2008
New Revision: 615291

URL: http://svn.apache.org/viewvc?rev=615291&view=rev
Log:
Only show scheduled options for current publication.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx?rev=615291&r1=615290&r2=615291&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx Fri Jan 25 10:06:50 2008
@@ -26,6 +26,11 @@
   <page:body>
     <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
     <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
+
+    <jx:set var="url" value="${usecase.getParameter('private.sourceUrl')}"/>
+    <jx:set var="steps" value="${url.split('/')}"/>
+    <jx:set var="currentPublicationId" value="${steps[1]}"/>
+
     <div id="contentblock1" class="lenya-tab-sitetree">
       
       <h1><i18n:text>Scheduler</i18n:text></h1>
@@ -47,19 +52,22 @@
               <jx:set var="parts" value="${name.split(':')}"/>
               <jx:set var="usecaseName" value="${parts[0]}"/>
               <jx:set var="userId" value="${parts[1]}"/>
-              <tr>
-                <td>
-                  <jx:out value="${usecaseName}"/>
-                </td>
-                <td>
-                  <a href="${usecase.getSourceURL()}?lenya.usecase=admin.user&amp;userId=${userId}"><jx:out value="${userId}"/></a>
-                </td>
-                <td>
-                  <i18n:date-time src-pattern="yyyy-MM-dd HH:mm:ss Z">
-                    <jx:formatDate pattern="yyyy-MM-dd HH:mm:ss Z" value="${job.getNextTime()}"/>
-                  </i18n:date-time>
-                </td>
-              </tr>
+              <jx:set var="pubId" value="${parts[2]}"/>
+              <jx:if test="${pubId == currentPublicationId}">
+                <tr>
+                  <td>
+                    <jx:out value="${usecaseName}"/>
+                  </td>
+                  <td>
+                    <a href="${usecase.getSourceURL()}?lenya.usecase=admin.user&amp;userId=${userId}"><jx:out value="${userId}"/></a>
+                  </td>
+                  <td>
+                    <i18n:date-time src-pattern="yyyy-MM-dd HH:mm:ss Z">
+                      <jx:formatDate pattern="yyyy-MM-dd HH:mm:ss Z" value="${job.getNextTime()}"/>
+                    </i18n:date-time>
+                  </td>
+                </tr>
+              </jx:if>
             </jx:forEach>
           </table>
         </jx:otherwise>
@@ -67,4 +75,4 @@
       
     </div>
   </page:body>
-</page:page>
\ No newline at end of file
+</page:page>

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java?rev=615291&r1=615290&r2=615291&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java Fri Jan 25 10:06:50 2008
@@ -38,6 +38,7 @@
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.ac.Machine;
 import org.apache.lenya.ac.User;
+import org.apache.lenya.cms.publication.URLInformation;
 import org.apache.lenya.cms.usecase.Usecase;
 import org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler;
 
@@ -47,7 +48,7 @@
  * </p>
  * <p>
  * The names of the scheduled jobs have the syntax
- * <code>{usecaseName}:{userId}</code>.
+ * <code>{usecaseName}:{userId}:{pubId}</code>.
  * 
  * @version $Id$
  */
@@ -114,7 +115,8 @@
     }
 
     protected String getJobName(Usecase usecase, String userId) {
-        return usecase.getName() + ":" + userId;
+        return usecase.getName() + ":" + userId + ":" + 
+                   getPublicationName(usecase);
     }
 
     protected ServiceManager manager;
@@ -163,4 +165,8 @@
         return entries;
     }
 
-}
\ No newline at end of file
+    protected String getPublicationName(Usecase usecase) {
+        URLInformation info = new URLInformation(usecase.getSourceURL());
+        return info.getPublicationId();
+    }
+}