Changeset 2272

Show
Ignore:
Timestamp:
07/16/09 13:19:46
Author:
johnsa
Message:

admin client: build the topical area tree based on the topical area flag in the calendar suite

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2267 r2272  
    25662566          <td> 
    25672567            <ul class="aliasTree"> 
    2568               <xsl:apply-templates select="form/subscriptions/calsuite/calendars/calendar" mode="showEventFormAliases"> 
    2569                 <xsl:with-param name="root">true</xsl:with-param> 
     2568              <xsl:apply-templates select="form/subscriptions/calsuite/calendars/calendar/calendar[isTopicalArea = 'true']" mode="showEventFormAliases"> 
     2569                <xsl:with-param name="root">false</xsl:with-param> 
    25702570              </xsl:apply-templates> 
    25712571            </ul> 
    …… 
    27912791      </xsl:if> 
    27922792 
    2793       <xsl:if test="calendar[isSubscription = 'true' or calType = '0']"> 
     2793      <!-- Return topical areas and all underlying calendars. 
     2794           Check for topical areas only if the subscription is owned by the calendar suite: 
     2795           If the subscription points out to a calendar or folder in another tree, 
     2796           return the branch regardless of the topical area setting.  --> 
     2797      <xsl:if test="calendar[(isSubscription = 'true' or calType = '0') and ((isTopicalArea = 'true' and  starts-with(path,/bedework/currentCalSuite/resourcesHome)) or not(starts-with(path,/bedework/currentCalSuite/resourcesHome)))]"> 
    27942798        <ul> 
    2795           <xsl:apply-templates select="calendar[isSubscription = 'true' or calType = '0']" mode="showEventFormAliases"/> 
     2799          <xsl:apply-templates select="calendar[(isSubscription = 'true' or calType = '0') and ((isTopicalArea = 'true' and  starts-with(path,/bedework/currentCalSuite/resourcesHome)) or not(starts-with(path,/bedework/currentCalSuite/resourcesHome)))]" mode="showEventFormAliases"/> 
    27962800        </ul> 
    27972801      </xsl:if> 
    …… 
    49294933        </tr> 
    49304934        <tr> 
     4935          <th>Topical Area:</th> 
     4936          <td> 
     4937            <input type="radio" name="calendar.isTopicalArea" value="true" checked="checked"/> true 
     4938            <input type="radio" name="calendar.isTopicalArea" value="false"/> false 
     4939          </td> 
     4940        </tr> 
     4941        <tr> 
    49314942          <th>Description:</th> 
    49324943          <td>