Changeset 495

Show
Ignore:
Timestamp:
05/19/06 01:54:13
Author:
johnsa
Message:

admin client:

fixed up calpath references;
trapped an error message for display;
corrected links to edit events from event listing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl

    r434 r495  
    447447 
    448448      <xsl:for-each select="/bedeworkadmin/events/event"> 
    449         <tr> 
    450           <td> 
    451             <xsl:copy-of select="title/*"/> 
     449        <xsl:variable name="subscriptionId" select="subscription/id"/> 
     450        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     451        <xsl:variable name="guid" select="guid"/> 
     452        <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     453        <tr> 
     454          <td> 
     455            <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     456              <xsl:value-of select="title"/> 
     457            </a> 
    452458          </td> 
    453459          <td class="date"> 
    …… 
    11991205 
    12001206 
    1201     <xsl:if test="/bedeworkadmin/canEdit = 'true' or /bedeworkadmin/userInfo/superUser = 'true'"> 
    1202       <xsl:variable name="id" select="id"/> 
    1203       <h3><a href="{$event-fetchForUpdate}&amp;eventId={$id}">Edit Event</a></h3> 
    1204     </xsl:if> 
     1207    <!--<xsl:if test="/bedeworkadmin/canEdit = 'true' or /bedeworkadmin/userInfo/superUser = 'true'"> 
     1208      <xsl:variable name="subscriptionId" select="subscription/id"/> 
     1209                        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     1210                        <xsl:variable name="guid" select="guid"/> 
     1211                        <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     1212      <h3> 
     1213                          <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1214          Edit Event 
     1215                          </a> 
     1216                  </h3> 
     1217    </xsl:if>--> 
    12051218  </xsl:template> 
    12061219 
    …… 
    15501563 
    15511564  <xsl:template match="calendar" mode="listForDisplay"> 
    1552     <xsl:variable name="calPath" select="calPath"/> 
     1565    <xsl:variable name="calPath" select="encodedPath"/> 
    15531566    <xsl:variable name="itemClass"> 
    15541567      <xsl:choose> 

  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/errors.xsl

    r283 r495  
    150150      <xsl:when test="id='org.bedework.error.unknowgroup'"> 
    151151        Error: unknown admin group:  <em><xsl:value-of select="param"/></em> 
     152      </xsl:when>> 
     153      <xsl:when test="id='org.bedework.exception.alreadyonadmingrouppath'"> 
     154        Error: group may not be added to itself 
    152155      </xsl:when> 
    153156      <xsl:when test="id='edu.rpi.sss.util.error.exc'"> 

  • trunk/calendar3/webadmin/war/docs/event/emitEvent.jsp

    r434 r495  
    1111</logic:present> 
    1212 
    13 <% String rpitemp="/event/fetchForUpdate.do?calid=" + calid + 
    14                   "&amp;guid=" + guid + "&amp;recurrenceId=" + rpitemprecurid; %> 
    15  
    1613<event> 
    1714  <id><bean:write name="event" property="id" /></id> 
    18   <title> 
    19     <genurl:link page="<%=rpitemp%>"> 
    20       <bean:write name="event" property="summary" /> 
    21     </genurl:link> 
    22   </title> 
     15  <title><bean:write name="event" property="summary" /></title> 
    2316  <bw:emitText name="event" property="guid" /> 
    2417  <bw:emitText name="event" property="recurrence.recurrenceId" tagName="recurrenceId" />