Changeset 2227

Show
Ignore:
Timestamp:
06/11/09 11:09:19
Author:
douglm
Message:

Allow setting/display of new Draft 7 scheduling privileges.
Disable setting of previous privileges.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/javascript/bedework/bedeworkAccess.js

    r2180 r2227  
    7676 
    7777var howBindVal = "create"; 
     78 
     79/* Old scheduling */ 
    7880var howScheduleVal = "schedule"; 
    7981var howScheduleRequestVal = "schedule-request"; 
    …… 
    8486 
    8587var howUnlockVal = "unlock"; 
     88 
     89var howScheduleDeliverVal = "schedule-deliver"; 
     90var howScheduleDeliverInviteVal = "schedule-deliver-invite"; 
     91var howScheduleDeliverReplyVal = "schedule-deliver-reply"; 
     92var howScheduleQueryFreebusyVal = "schedule-query-freebusy"; 
     93 
     94var howScheduleSendVal = "schedule-send"; 
     95var howScheduleSendInviteVal = "schedule-send-invite"; 
     96var howScheduleSendReplyVal = "schedule-send-reply"; 
     97var howScheduleSendFreebusyVal = "schedule-send-freebusy"; 
    8698 
    8799// How denied accesses appear 
    …… 
    107119 
    108120var howDenyUnlockVal = "not-unlock"; 
     121 
     122var howDenyScheduleDeliverVal = "not-schedule-deliver"; 
     123var howDenyScheduleDeliverInviteVal = "not-schedule-deliver-invite"; 
     124var howDenyScheduleDeliverReplyVal = "not-schedule-deliver-reply"; 
     125var howDenyScheduleQueryFreebusyVal = "not-schedule-query-freebusy"; 
     126 
     127var howDenyScheduleSendVal = "not-schedule-send"; 
     128var howDenyScheduleSendInviteVal = "not-schedule-send-invite"; 
     129var howDenyScheduleSendReplyVal = "not-schedule-send-reply"; 
     130var howDenyScheduleSendFreebusy = "not-schedule-send-freebusy"; 
    109131 
    110132//var howNoneVal = "none"; 
    …… 
    173195  var hv = new Array(); 
    174196 
    175   hv.push(new howVals("A", "RrPFWapcbStysuN", "<D:all/>", howAllVal, howDenyAllVal)); 
     197  hv.push(new howVals("A", "RrPFWapcbStysuNDieqTIEQ", "<D:all/>", howAllVal, howDenyAllVal)); 
    176198 
    177199  hv.push(new howVals("R", "rPF", "<D:read/>", howReadVal, howDenyReadVal)); 
    …… 
    184206  hv.push(new howVals("p", "", "<D:write-properties/>", howWritePropertiesVal, howDenyWritePropertiesVal)); 
    185207  hv.push(new howVals("c", "", "<D:write-content/>", howWriteContentVal, howDenyWriteContentVal)); 
    186  
    187208  hv.push(new howVals("b", "Stys", "<D:bind/>", howBindVal, howDenyBindVal)); 
     209 
     210  /* Old caldav sched - should disallow use */ 
    188211  hv.push(new howVals("S", "tys", "<C:schedule/>", howScheduleVal, howDenyScheduleVal)); 
    189212  hv.push(new howVals("t", "", "<C:schedule-request/>", howScheduleRequestVal, howDenyScheduleRequestVal)); 
    …… 
    194217 
    195218  hv.push(new howVals("U", "", "<D:unlock/>", howUnlockVal, howDenyUnlockVal)); 
     219 
     220  hv.push(new howVals("D", "ieq", "<C:schedule-deliver/>", 
     221      howScheduleDeliverVal, howDenyScheduleDeliverVal)); 
     222  hv.push(new howVals("i", "", "<C:schedule-deliver-invite/>", 
     223      howScheduleDeliverInviteVal, howDenyScheduleDeliverInviteVal)); 
     224  hv.push(new howVals("e", "", "<C:schedule-deliver-reply/>", 
     225      howScheduleDeliverReplyVal, howDenyScheduleDeliverReplyVal)); 
     226  hv.push(new howVals("q", "", "<C:schedule-query-freebusy/>", 
     227      howScheduleQueryFreebusyVal, howDenyScheduleQueryFreebusyVal)); 
     228 
     229  hv.push(new howVals("T", "IEQ", "<C:schedule-send/>", 
     230      howScheduleSendVal, howDenyScheduleSendVal)); 
     231  hv.push(new howVals("I", "", "<C:schedule-send-invite/>", 
     232      howScheduleSendInviteVal, howDenyScheduleSendInviteVal)); 
     233  hv.push(new howVals("E", "", "<C:schedule-send-reply/>", 
     234      howScheduleSendReplyVal, howDenyScheduleSendReplyVal)); 
     235  hv.push(new howVals("Q", "", "<C:schedule-send-freebusy/>", 
     236      howScheduleSendFreebusyVal, howDenyScheduleSendFreebusy)); 
    196237 
    197238  //hv.push(new howVals("N", "rPFapcbStysu", "", howNoneVal)); // None is -A 

  • trunk/deployment/resources/xsl/default/default/bedeworkAccess.xsl

    r2121 r2227  
    178178              </td> 
    179179            </tr> 
     180            <!--  Old style scheduling - disable setting 
    180181            <tr> 
    181182              <td class="level4"> 
    …… 
    222223              </td> 
    223224            </tr> 
     225            End of old style scheduling --> 
    224226            <tr> 
    225227              <td class="level3"> 
    …… 
    231233              <td> 
    232234                <input type="radio" value="-u" name="u" disabled="disabled"/> 
     235              </td> 
     236            </tr> 
     237            <tr> 
     238              <td class="level2"> 
     239                <input type="checkbox" value="D" id="accessScheduleDeliver" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)" checked="checked"/> Schedule-deliver 
     240              </td> 
     241              <td> 
     242                <input type="radio" value="D" name="accessScheduleDeliver" checked="checked"/> 
     243              </td> 
     244              <td> 
     245                <input type="radio" value="-D" name="accessScheduleDeliver"/> 
     246              </td> 
     247            </tr> 
     248            <tr> 
     249              <td class="level3"> 
     250                <input type="checkbox" value="i" id="i" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule-deliver-invite 
     251              </td> 
     252              <td> 
     253                <input type="radio" value="i" name="i" checked="checked" disabled="disabled"/> 
     254              </td> 
     255              <td> 
     256                <input type="radio" value="-i" name="i" disabled="disabled"/> 
     257              </td> 
     258            </tr> 
     259            <tr> 
     260              <td class="level3"> 
     261                <input type="checkbox" value="e" id="e" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule-deliver-reply 
     262              </td> 
     263              <td> 
     264                <input type="radio" value="e" name="e" checked="checked" disabled="disabled"/> 
     265              </td> 
     266              <td> 
     267                <input type="radio" value="-e" name="e" disabled="disabled"/> 
     268              </td> 
     269            </tr> 
     270            <tr> 
     271              <td class="level3"> 
     272                <input type="checkbox" value="q" id="q" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule-query-freebusy 
     273              </td> 
     274              <td> 
     275                <input type="radio" value="q" name="q" checked="checked" disabled="disabled"/> 
     276              </td> 
     277              <td> 
     278                <input type="radio" value="-q" name="q" disabled="disabled"/> 
     279              </td> 
     280            </tr> 
     281            <tr> 
     282              <td class="level2"> 
     283                <input type="checkbox" value="T" id="accessScheduleSend" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)" checked="checked"/> Schedule-send 
     284              </td> 
     285              <td> 
     286                <input type="radio" value="T" name="accessScheduleSend" checked="checked"/> 
     287              </td> 
     288              <td> 
     289                <input type="radio" value="-T" name="accessScheduleSend"/> 
     290              </td> 
     291            </tr> 
     292            <tr> 
     293              <td class="level3"> 
     294                <input type="checkbox" value="I" id="I" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule-send-invite 
     295              </td> 
     296              <td> 
     297                <input type="radio" value="I" name="I" checked="checked" disabled="disabled"/> 
     298              </td> 
     299              <td> 
     300                <input type="radio" value="-I" name="I" disabled="disabled"/> 
     301              </td> 
     302            </tr> 
     303            <tr> 
     304              <td class="level3"> 
     305                <input type="checkbox" value="E" id="E" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule-send-reply 
     306              </td> 
     307              <td> 
     308                <input type="radio" value="E" name="E" checked="checked" disabled="disabled"/> 
     309              </td> 
     310              <td> 
     311                <input type="radio" value="-E" name="E" disabled="disabled"/> 
     312              </td> 
     313            </tr> 
     314            <tr> 
     315              <td class="level3"> 
     316                <input type="checkbox" value="Q" id="Q" name="howItem" disabled="disabled" onclick="toggleAllowDenyFlag(this, this.form)"/> schedule-send-freebusy 
     317              </td> 
     318              <td> 
     319                <input type="radio" value="Q" name="Q" checked="checked" disabled="disabled"/> 
     320              </td> 
     321              <td> 
     322                <input type="radio" value="-Q" name="Q" disabled="disabled"/> 
    233323              </td> 
    234324            </tr> 
    …… 
    337427       <xsl:when test="$name = 'unbind'">u</xsl:when> 
    338428       <xsl:when test="$name = 'unlock'">U</xsl:when> 
     429       <xsl:when test="$name = 'schedule-deliver'">D</xsl:when> 
     430       <xsl:when test="$name = 'schedule-deliver-invite'">i</xsl:when> 
     431       <xsl:when test="$name = 'schedule-deliver-reply'">e</xsl:when> 
     432       <xsl:when test="$name = 'schedule-query-freebusy'">q</xsl:when> 
     433       <xsl:when test="$name = 'schedule-send'">T</xsl:when> 
     434       <xsl:when test="$name = 'schedule-send-invite'">I</xsl:when> 
     435       <xsl:when test="$name = 'schedule-send-reply'">E</xsl:when> 
     436       <xsl:when test="$name = 'schedule-send-freebusy'">Q</xsl:when> 
    339437       <xsl:when test="$name = 'none'">N</xsl:when> 
    340438     </xsl:choose><!--