continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r497416 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/component/ mdo/ webapp/WEB-INF/jsp/components/
Date Thu, 18 Jan 2007 12:50:59 GMT
Author: evenisse
Date: Thu Jan 18 04:50:55 2007
New Revision: 497416

URL: http://svn.apache.org/viewvc?view=rev&rev=497416
Log:
[CONTINUUM-1137] Add a link to the schedule
Submitted by: Henry S. Isidro

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?view=diff&rev=497416&r1=497415&r2=497416
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
Thu Jan 18 04:50:55 2007
@@ -150,6 +150,7 @@
         bds.setId( bd.getId() );
         bds.setArguments( bd.getArguments() );
         bds.setBuildFile( bd.getBuildFile() );
+        bds.setScheduleId( bd.getSchedule().getId() );
         bds.setScheduleName( bd.getSchedule().getName() );
         bds.setIsDefault( bd.isDefaultForProject() );
         bds.setIsBuildFresh( bd.isBuildFresh() );

Modified: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo?view=diff&rev=497416&r1=497415&r2=497416
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Thu Jan 18 04:50:55
2007
@@ -301,6 +301,13 @@
           <type>boolean</type>
         </field>
         <field>
+          <name>scheduleId</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>id of the schedule for build definition</description>
+          <type>int</type>
+        </field>
+        <field>
           <name>scheduleName</name>
           <version>1.0.0</version>
           <required>true</required>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=497416&r1=497415&r2=497416
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Thu Jan 18 04:50:55 2007
@@ -39,7 +39,17 @@
       <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
       <!-- ec:column property="profile" title="projectView.buildDefinition.profile"/ -->
-      <ec:column property="scheduleName" title="schedule"/>
+      <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
+        <pss:ifAuthorized permission="continuum-manage-schedules">
+          <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
+            <ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
+          </ww:url>
+          <ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a>

+        </pss:ifAuthorized>
+        <pss:elseAuthorized>
+          ${pageScope.buildDefinitionSummary.scheduleName}
+        </pss:elseAuthorized>
+      </ec:column>
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>
@@ -115,7 +125,17 @@
       <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
       <!-- ec:column property="profile" title="projectView.buildDefinition.profile"/ -->
-      <ec:column property="scheduleName" title="schedule"/>
+      <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
+        <pss:ifAuthorized permission="continuum-manage-schedules">
+          <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
+            <ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
+          </ww:url>
+          <ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a>

+        </pss:ifAuthorized>
+        <pss:elseAuthorized>
+          ${pageScope.buildDefinitionSummary.scheduleName}
+        </pss:elseAuthorized>
+      </ec:column>
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>
       <ec:column property="buildNowAction" title="&nbsp;" width="1%">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=497416&r1=497415&r2=497416
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Thu Jan 18 04:50:55 2007
@@ -36,7 +36,17 @@
       <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
       <ec:column property="profile" title="projectView.buildDefinition.profile"/>
-      <ec:column property="scheduleName" title="schedule"/>
+      <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
+        <pss:ifAuthorized permission="continuum-manage-schedules">
+          <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
+            <ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
+          </ww:url>
+          <ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a>

+        </pss:ifAuthorized>
+        <pss:elseAuthorized>
+          ${pageScope.buildDefinitionSummary.scheduleName}
+        </pss:elseAuthorized>
+      </ec:column>
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>



Mime
View raw message