Changeset 3526

Show
Ignore:
Timestamp:
03/29/12 13:52:49
Author:
johnsa
Message:

admin client: set preferred and all lists for locations and contacts correctly when a user edits a pending event

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3525 r3526  
    26832683              <xsl:if test="form/location/preferred/select/option"> 
    26842684                <select name="prefLocationId" id="bwPreferredLocationList"> 
     2685                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2686                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2687                  </xsl:if> 
    26852688                  <option value=""> 
    26862689                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    26902693              </xsl:if> 
    26912694              <select name="allLocationId" id="bwAllLocationList"> 
    2692                 <xsl:if test="form/location/preferred/select/option"> 
     2695                <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
    26932696                  <xsl:attribute name="class">invisible</xsl:attribute> 
    26942697                </xsl:if> 
    …… 
    27022705                   locations exist --> 
    27032706              <xsl:if test="form/location/preferred/select/option"> 
    2704                 <input type="radio" name="toggleLocationLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"/> 
     2707                <input type="radio" name="toggleLocationLists" value="preferred" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"> 
     2708                  <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
     2709                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2710                  </xsl:if> 
     2711                </input> 
    27052712                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2706                 <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"/> 
     2713                <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"> 
     2714                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2715                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2716                  </xsl:if> 
     2717                </input> 
    27072718                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27082719              </xsl:if> 
    …… 
    27592770              <xsl:if test="form/contact/preferred/select/option"> 
    27602771                <select name="prefContactId" id="bwPreferredContactList"> 
     2772                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2773                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2774                  </xsl:if> 
    27612775                  <option value=""> 
    27622776                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    27662780              </xsl:if> 
    27672781              <select name="allContactId" id="bwAllContactList"> 
    2768                 <xsl:if test="form/contact/preferred/select/option"> 
     2782                <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
    27692783                  <xsl:attribute name="class">invisible</xsl:attribute> 
    27702784                </xsl:if> 
    …… 
    27782792                   contacts exist --> 
    27792793              <xsl:if test="form/contact/preferred/select/option"> 
    2780                 <input type="radio" name="toggleContactLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"/> 
     2794                <input type="radio" name="toggleContactLists" value="preferred" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"> 
     2795                  <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
     2796                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2797                  </xsl:if> 
     2798                </input> 
    27812799                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2782                 <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"/> 
     2800                <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"> 
     2801                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2802                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2803                  </xsl:if> 
     2804                </input> 
    27832805                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27842806              </xsl:if> 

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

    r3525 r3526  
    26832683              <xsl:if test="form/location/preferred/select/option"> 
    26842684                <select name="prefLocationId" id="bwPreferredLocationList"> 
     2685                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2686                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2687                  </xsl:if> 
    26852688                  <option value=""> 
    26862689                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    26902693              </xsl:if> 
    26912694              <select name="allLocationId" id="bwAllLocationList"> 
    2692                 <xsl:if test="form/location/preferred/select/option"> 
     2695                <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
    26932696                  <xsl:attribute name="class">invisible</xsl:attribute> 
    26942697                </xsl:if> 
    …… 
    27022705                   locations exist --> 
    27032706              <xsl:if test="form/location/preferred/select/option"> 
    2704                 <input type="radio" name="toggleLocationLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"/> 
     2707                <input type="radio" name="toggleLocationLists" value="preferred" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"> 
     2708                  <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
     2709                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2710                  </xsl:if> 
     2711                </input> 
    27052712                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2706                 <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"/> 
     2713                <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"> 
     2714                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2715                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2716                  </xsl:if> 
     2717                </input> 
    27072718                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27082719              </xsl:if> 
    …… 
    27592770              <xsl:if test="form/contact/preferred/select/option"> 
    27602771                <select name="prefContactId" id="bwPreferredContactList"> 
     2772                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2773                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2774                  </xsl:if> 
    27612775                  <option value=""> 
    27622776                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    27662780              </xsl:if> 
    27672781              <select name="allContactId" id="bwAllContactList"> 
    2768                 <xsl:if test="form/contact/preferred/select/option"> 
     2782                <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
    27692783                  <xsl:attribute name="class">invisible</xsl:attribute> 
    27702784                </xsl:if> 
    …… 
    27782792                   contacts exist --> 
    27792793              <xsl:if test="form/contact/preferred/select/option"> 
    2780                 <input type="radio" name="toggleContactLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"/> 
     2794                <input type="radio" name="toggleContactLists" value="preferred" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"> 
     2795                  <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
     2796                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2797                  </xsl:if> 
     2798                </input> 
    27812799                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2782                 <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"/> 
     2800                <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"> 
     2801                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2802                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2803                  </xsl:if> 
     2804                </input> 
    27832805                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27842806              </xsl:if>