Changeset 386

Show
Ignore:
Timestamp:
04/19/06 14:33:38
Author:
johnsa
Message:

some clean up to struts-config for calendar acls; way now prepared for setting event acls.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r385 r386  
    5959  <xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/> 
    6060  <xsl:variable name="getFreeBusy" select="/bedework/urlPrefixes/getFreeBusy/a/@href"/> 
    61   <xsl:variable name="setAccess" select="/bedework/urlPrefixes/setAccess/a/@href"/> 
    6261  <!-- calendars --> 
    6362  <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/> 
    …… 
    6968  <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used --> 
    7069  <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/><!-- used --> 
     70  <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/> 
    7171  <!-- subscriptions --> 
    7272  <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
    …… 
    19481948          <xsl:for-each select="period"> 
    19491949            <xsl:variable name="startTime"><xsl:apply-templates  select="start" mode="timeDisplay"/></xsl:variable> 
     1950            <xsl:variable name="startDate" select="start"/> 
    19501951            <xsl:choose> 
    19511952              <xsl:when test="fbtype = '0'"> 
    19521953                <td class="busy"> 
    1953                   <a href="" title="{$startTime}">*</a> 
     1954                  <a href="{$initEvent}?date={$startDate}" title="{$startTime}">*</a> 
    19541955                </td> 
    19551956              </xsl:when> 
    19561957              <xsl:otherwise> 
    19571958                <td class="free"> 
    1958                   <a href="" title="{$startTime}">*</a> 
     1959                  <a href="{$initEvent}?date={$startDate}" title="{$startTime}">*</a> 
    19591960                </td> 
    19601961              </xsl:otherwise> 
    …… 
    22862287        </xsl:if> 
    22872288      </table> 
    2288       <form name="calendarShareForm" action="{$setAccess}" id="shareForm"> 
     2289      <form name="calendarShareForm" action="{$calendar-setAccess}" id="shareForm"> 
    22892290        <input type="hidden" name="calId" value="{$id}"/> 
    22902291        <p> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl

    r383 r386  
    3030          <p>Unknown calendar.</p> 
    3131      </xsl:when> 
     32      <xsl:when test="id='org.bedework.client.error.usernotfound'"> 
     33          <p>User not found.</p> 
     34      </xsl:when> 
    3235      <xsl:when test="id='org.bedework.client.error.location.referenced'"> 
    3336          <p>Location is in use.  It cannot be deleted while referenced by an event.</p> 

  • trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

    r379 r386  
    296296    </action> 
    297297 
    298     <action    path="/setAccess" 
    299                type="org.bedework.webcommon.access.AccessAction" 
    300                name="calForm" 
    301                scope="session" 
    302                validate="false"> 
    303     </action> 
    304  
    305298    <action    path="/manageLocations" 
    306299               type="org.bedework.webclient.BwAction" 
    …… 
    368361      <forward name="success" path="/docs/calendar/displayCalendar.jsp"/> 
    369362    </action> 
    370  
    371363 
    372364    <action    path="/calendar/showReferenced" 
    …… 
    459451    </action> 
    460452 
     453    <action    path="/calendar/setAccess" 
     454               type="org.bedework.webcommon.access.AccessAction" 
     455               name="calForm" 
     456               scope="session" 
     457               validate="false"> 
     458      <forward name="success" path="/calendar/showModForm.rdo" redirect="true" /> 
     459      <forward name="error" path="/calendar/showModForm.rdo" redirect="true" /> 
     460      <forward name="notFound" path="/calendar/showModForm.rdo" redirect="true" /> 
     461      <forward name="doNothing" path="/calendar/showModForm.rdo" redirect="true" /> 
     462    </action> 
    461463    <!-- ....................... system stats .......................... --> 
    462464 

  • trunk/calendar3/webclient/war/docs/header.jsp

    r383 r386  
    140140 
    141141      <getFreeBusy><genurl:link page="/getFreeBusy.do?b=de"/></getFreeBusy> 
    142       <setAccess><genurl:link page="/setAccess.do?b=de"/></setAccess> 
    143142 
    144143      <calendar> 
    …… 
    150149        <fetchForUpdate><genurl:link page="/calendar/fetchForUpdate.do?b=de"/></fetchForUpdate><!-- keep --> 
    151150        <update><genurl:link page="/calendar/update.do?b=de"/></update><!-- keep --> 
     151        <setAccess><genurl:link page="/calendar/setAccess.do?b=de"/></setAccess> 
    152152      </calendar> 
    153153