Changeset 2087

Show
Ignore:
Timestamp:
03/03/09 14:36:14
Author:
johnsa
Message:

begin work on submissions client;
admin client: check for broken aliases

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2080 r2087  
    23992399        <!-- hide the root calendar. --> 
    24002400        <xsl:choose> 
     2401          <xsl:when test="calType = '7' or calType = '8'"> 
     2402            <!-- we've hit an unresolvable alias; stop descending --> 
     2403            <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 
     2404            <em><xsl:value-of select="name"/>?</em> 
     2405          </xsl:when> 
    24012406          <xsl:when test="calType = '0'"> 
    24022407            <!-- no direct selecting of folders or folder aliases: we only want users to select the 
    …… 
    24042409            <!--img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/--> 
    24052410            <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 
     2411            <xsl:value-of select="name"/> 
    24062412          </xsl:when> 
    24072413          <xsl:otherwise> 
    …… 
    24102416              <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    24112417            </input> 
     2418            <xsl:value-of select="name"/> 
    24122419          </xsl:otherwise> 
    24132420        </xsl:choose> 
    2414         <xsl:value-of select="name"/> 
    24152421      </xsl:if> 
    24162422 
    …… 
    42034209              8 - External subscription (internal - the underlying calType will be returned; check for the isSubscription property and check on the item's status) 
    42044210              9 - Resource collection 
     4211 
     4212      calType 7 and 8 will only be returned when a link to an alias is broken. 
     4213      The system will instead return the underlying calendar type (down the tree). 
     4214      Check the isSubscription flag to see if a collection is an alias and set 
     4215      icons etc. based on that + the underlying calType. 
    42054216  --> 
    42064217 

  • trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl

    r2057 r2087  
    535535            <td class="fieldval"> 
    536536              <xsl:choose> 
    537                 <xsl:when test="$submissionCalendars = 1"> 
     537                <xsl:when test="$submissionCalendars &gt; 1"> 
    538538                  <!-- there is only 1 writable calendar, just send a hidden field --> 
    539539                  <xsl:variable name="newCalPath"><xsl:value-of select="/bedework/myCalendars//calendar[calType='1']/path"/></xsl:variable>