Changeset 2169

Show
Ignore:
Timestamp:
05/13/09 12:12:41
Author:
johnsa
Message:

admin client: remove reference to subscriptionId (deprecated)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2168 r2169  
    980980  <xsl:template match="event" mode="eventListCommon"> 
    981981    <xsl:param name="pending">false</xsl:param> 
    982     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    983982    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    984983    <xsl:variable name="guid" select="guid"/> 
    …… 
    988987        <xsl:choose> 
    989988          <xsl:when test="$pending = 'true'"> 
    990             <a href="{$event-fetchForUpdatePending}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     989            <a href="{$event-fetchForUpdatePending}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    991990              <xsl:choose> 
    992991                <xsl:when test="summary != ''"> 
    …… 
    1000999          </xsl:when> 
    10011000          <xsl:otherwise> 
    1002             <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1001            <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    10031002              <xsl:choose> 
    10041003                <xsl:when test="summary != ''"> 
    …… 
    10461045            Recurring event. 
    10471046            Edit: 
    1048             <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}"> 
     1047            <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}"> 
    10491048              master 
    10501049            </a> | 
    1051             <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1050            <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    10521051              instance 
    10531052            </a> 
    …… 
    10591058 
    10601059  <xsl:template match="formElements" mode="modEvent"> 
    1061     <xsl:variable name="subscriptionId" select="subscriptionId"/> 
    1062     <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/> 
    1063     <xsl:variable name="calPath" select="form/calendar/path"/> 
     1060    <xsl:variable name="calPathEncoded" select="form/calendar/event/encodedPath"/> 
     1061    <xsl:variable name="calPath" select="form/calendar/event/path"/> 
    10641062    <xsl:variable name="guid" select="guid"/> 
    10651063    <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    10661064    <xsl:variable name="eventTitle" select="form/title/input/@value"/> 
    1067     <xsl:variable name="eventUrl"><xsl:value-of select="$publicCal"/>/event/eventView.do?subid=<xsl:value-of select="$subscriptionId"/>&amp;calPath=<xsl:value-of select="$calPathEncoded"/>&amp;guid=<xsl:value-of select="$guid"/>&amp;recurrenceId=<xsl:value-of select="$recurrenceId"/></xsl:variable> 
     1065    <xsl:variable name="eventUrlPrefix"><xsl:value-of select="$publicCal"/>/event/eventView.do?guid=<xsl:value-of select="$guid"/>&amp;recurrenceId=<xsl:value-of select="$recurrenceId"/></xsl:variable> 
    10681066 
    10691067    <h2>Event Information</h2> 
    …… 
    11581156      <xsl:call-template name="submitEventButtons"> 
    11591157        <xsl:with-param name="eventTitle" select="$eventTitle"/> 
    1160         <xsl:with-param name="eventUrl" select="$eventUrl"/> 
     1158        <xsl:with-param name="eventUrlPrefix" select="$eventUrlPrefix"/> 
    11611159      </xsl:call-template> 
    11621160 
    …… 
    15641562                     so provide access to master event --> 
    15651563                <em>This event is a recurrence instance.</em><br/> 
    1566                 <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">edit master event</a> 
     1564                <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">edit master event</a> 
    15671565              </xsl:when> 
    15681566              <xsl:otherwise> 
    …… 
    25372535        <!-- don't create two instances of the submit buttons on pending events; 
    25382536             the publishing buttons require numerous unique ids --> 
    2539         <xsl:call-template name="submitEventButtons">> 
     2537        <xsl:call-template name="submitEventButtons"> 
    25402538          <xsl:with-param name="eventTitle" select="$eventTitle"/> 
    2541           <xsl:with-param name="eventUrl" select="$eventUrl"/> 
     2539          <xsl:with-param name="eventUrlPrefix" select="$eventUrlPrefix"/> 
    25422540        </xsl:call-template> 
    25432541      </xsl:if> 
    …… 
    25892587  <xsl:template name="submitEventButtons"> 
    25902588    <xsl:param name="eventTitle"/> 
    2591     <xsl:param name="eventUrl"/> 
     2589    <xsl:param name="eventUrlPrefix"/> 
    25922590    <div class="submitBox"> 
    25932591      <xsl:choose> 
    …… 
    26432641              <input type="submit" name="updateSubmitEvent" value="Update Event"/> 
    26442642              <input type="submit" name="publishEvent" value="Publish Event"> 
    2645                 <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrl"/>');</xsl:attribute> 
     2643                <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>');</xsl:attribute> 
    26462644              </input> 
    26472645              <input type="submit" name="cancel" value="Cancel"/> 
    …… 
    64386436      </xsl:if> 
    64396437      <xsl:for-each select="/bedework/searchResults/searchResult"> 
    6440         <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
    64416438        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
    64426439        <xsl:variable name="guid" select="event/guid"/> 
    …… 
    64506447          </td> 
    64516448          <td> 
    6452             <a href="{$event-fetchForDisplay}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     6449            <a href="{$event-fetchForDisplay}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    64536450              <xsl:value-of select="event/summary"/> 
    64546451            </a> 

  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r2167 r2169  
    702702} 
    703703 
    704 function doPublishEvent(publishingCal,eventTitle,eventUrl) { 
     704function doPublishEvent(publishingCal,eventTitle,eventUrlPrefix) { 
    705705  // User has submitted the event when there is only a single publishing calendar. 
    706706  // Update the newCalPath to reflect the publishing calendar: 
    …… 
    717717  snsubject.value = "Event Approved: " + eventTitle; 
    718718  sntext = document.getElementById("sntext"); 
    719   sntext.value = "Your event has been approved and is now published.\n\nEVENT DETAILS\n-------------\n\nTitle: " + eventTitle + "\nURL: " + eventUrl; 
     719  sntext.value = "Your event has been approved and is now published.\n\nEVENT DETAILS\n-------------\n\nTitle: " + eventTitle + "\nURL: " + eventUrlPrefix + "&" + publishingCal; 
    720720} 
    721721function doRejectEvent(reason,eventTitle) {