Changeset 253

Show
Ignore:
Timestamp:
03/03/06 09:17:03
Author:
douglm
Message:

Inconsistent spelling of unremo(e)able caused problems - still inconsistent.

Fixed stylesheet so unremovable radio buttons work correctly
Fixed SubscriptionAction? to recognize "unremoveable"

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwSubscription.java

    r119 r253  
    353353    sub.setAffectsFreeBusy(getAffectsFreeBusy()); 
    354354    sub.setEmailNotifications(getEmailNotifications()); 
     355    sub.setUnremoveable(getUnremoveable()); 
    355356  } 
    356357 

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

    r250 r253  
    19531953        </tr> 
    19541954        <tr> 
    1955           <th>Unremoveable:</th> 
     1955          <th>Unremovable:</th> 
    19561956          <td> 
    19571957            <input type="radio" value="true" name="unremoveable" size="60"/> true 
    …… 
    20262026        </tr> 
    20272027        <tr> 
    2028           <th>Unremoveable:</th> 
    2029           <td> 
    2030             <xsl:variable name="subUnremoveable" select="subscription.unremoveable"/> 
     2028          <th>Unremovable:</th> 
     2029          <td> 
    20312030            <xsl:choose> 
    2032               <xsl:when test="$subUnremoveable = 'true'"> 
     2031              <xsl:when test="unremoveable='true'"> 
    20332032                <input type="radio" value="true" name="unremoveable" size="60" checked="checked"/> true 
    20342033                <input type="radio" value="false" name="unremoveable" size="60"/> false 
    …… 
    20652064        <th>Style</th> 
    20662065        <th>Display</th> 
    2067         <th>Unremoveable</th> 
     2066        <th>Unremovable</th> 
    20682067        <th>External</th> 
    20692068        <th>Deleted?</th> 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/SubscribeAction.java

    r163 r253  
    118118    } 
    119119 
    120     Boolean bool = getBooleanReqPar(request, "unremovable"); 
     120    Boolean bool = getBooleanReqPar(request, "unremoveable"); 
    121121    if (bool != null) { 
    122122      if (!form.getUserAuth().isSuperUser()) {