Changeset 2268

Show
Ignore:
Timestamp:
07/14/09 11:55:43
Author:
johnsa
Message:

admin client: correctly set filters when adding calendars in public tree

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.5/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2264 r2268  
    39193919  <xsl:template match="currentCalendar" mode="addCalendar"> 
    39203920    <h3>Add Calendar, Folder, or Subscription</h3> 
    3921     <form name="addCalForm" method="post" action="{$calendar-update}" onsubmit="setCalendarAlias(this)"> 
     3921    <p class="note">Note: Access may be set on a calendar after it is created.</p> 
     3922    <form name="addCalForm" method="post" action="{$calendar-update}" onsubmit="setCatFilters(this);return setCalendarAlias(this);"> 
    39223923      <table class="common"> 
    39233924        <tr> 
    …… 
    40254026        </tr> 
    40264027      </table> 
    4027       <div class="submitButtons"> 
    4028         <input type="submit" name="addCalendar" value="Add"/> 
    4029         <input type="submit" name="cancelled" value="cancel"/> 
    4030       </div> 
     4028 
    40314029      <div id="subscriptionTypes" class="invisible"> 
    40324030        <h4>Subscription URL</h4> 
     4031        <input type="hidden" value="publicTree" name="subType" id="bwSubType"/> 
    40334032        <div id="subscriptionTypeExternal"> 
    40344033          <table class="common" id="subscriptionTypes"> 
    …… 
    40594058      </div> 
    40604059 
    4061       <div id="sharingBox"> 
     4060      <!-- div id="sharingBox"> 
    40624061        <h3>Current Access:</h3> 
    40634062        <div id="bwCurrentAccessWidget">&#160;</div> 
    …… 
    40684067          <xsl:with-param name="outputId">bwCurrentAccessWidget</xsl:with-param> 
    40694068        </xsl:call-template> 
    4070       </div> 
     4069      </div--> 
    40714070 
    40724071      <div class="submitButtons"> 
    …… 
    40754074      </div> 
    40764075    </form> 
    4077  
    4078     <!-- div id="sharingBox"> 
    4079       <h3>Current Access:</h3> 
    4080       Sharing may be added to a calendar once created. 
    4081     </div--> 
    40824076  </xsl:template> 
    40834077 
    …… 
    49174911  <xsl:template match="currentCalendar" mode="addSubscription"> 
    49184912    <h3>Add Subscription</h3> 
     4913    <p class="note">Note: Access may be set on a subscription after it is created.</p> 
    49194914    <form name="addCalForm" method="post" action="{$subscriptions-update}" onsubmit="setCatFilters(this);return setCalendarAlias(this);"> 
    49204915      <table class="common"> 
    …… 
    50635058        </tr> 
    50645059      </table> 
    5065  
    5066       <div id="sharingBox"> 
     5060      <!-- div id="sharingBox"> 
    50675061        <h3>Current Access:</h3> 
    50685062        <div id="bwCurrentAccessWidget">&#160;</div> 
    …… 
    50735067          <xsl:with-param name="outputId">bwCurrentAccessWidget</xsl:with-param> 
    50745068        </xsl:call-template> 
    5075       </div> 
     5069      </div--> 
    50765070 
    50775071      <div class="submitButtons"> 

  • releases/bedework-3.5/deployment/webadmin/webapp/resources/resources/bedework.js

    r2157 r2268  
    191191  } else if (formObj.type.value == "subscription") { 
    192192    switch (formObj.subType.value) { 
     193      case "publicTree": 
     194        // do nothing: when adding a subscription to the public tree, we set the fields directly. 
     195        break; 
    193196      case "public": 
    194197        formObj.aliasUri.value = "bwcal://" + formObj.publicAliasHolder.value;