Changeset 1448

Timestamp:

07/01/07 00:34:06

Author:

douglm

Message:

Setting access for an event in user client almost works again

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkAccess.js (modified) (16 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (1 diff)

trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkAccess.js

@@ -44 +44 @@
-// ========================================================================
-//   Language and customization
+//   These should come from values in the header or included as a separate cutomization
+//   file.
-
-var authenticatedStr = "authenticated";
@@ -52 +54 @@
-var grantStr = "grant";
-
+// How granted accesses appear
-var howAllVal = "all";
-
@@ -74 +77 @@
-var howUnlockVal = "unlock";
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// ========================================================================
-// ========================================================================
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  var how;
-  var contains;
+  var davEl;
-  var dispVal;
+  var denyDispVal;
-
-  this.how = h;
-  this.contains = cont;
+  this.davEl = davEl;
-  this.dispVal = dv;
+  this.denyDispVal = ddv;
-
-  /* return true if ch is contained in this access */
@@ -95 +152 @@
-    return this.contains.match(ch) != null;
-  }
+
+  this.getDispVal = function(negated) {
+    if (negated) {
+      return this.denyDispVal;
+    }
+
+    return this.dispVal;
+  }
-}
-
@@ -100 +165 @@
-  var hv = new Array();
-
-how
-
-how
-how
-how
-how
-
-how
-how
-how
-how
-
-how
-how
-how
-how
-how
-
-how
-
-how
-
-hv.push(new howVals("N", "rPFapcbStysu", howNoneVal));
+"<D:all/>", howAllVal, howDeny
+
+"<D:read/>", howReadVal, howDeny
+"<D:read-acl/>", howReadAclVal, howDeny
+"<D:read-current-user-privilege-set/>", howReadCurPrivSetVal, howDeny
+"<C:read-free-busy/>", howReadFreebusyVal, howDeny
+
+"<D:write/>", howWriteVal, howDeny
+"<D:write-acl/>", howWriteAclVal, howDeny
+"<D: write-properties/>", howWritePropertiesVal, howDeny
+"<D:write-content/>", howWriteContentVal, howDeny
+
+"<D:bind/>", howBindVal, howDeny
+"<C:schedule/>", howScheduleVal, howDeny
+"<C:schedule-request/>", howScheduleRequestVal, howDeny
+"<C:schedule-reply/>", howScheduleReplyVal, howDeny
+"<C:schedule-free-busy/>", howScheduleFreebusyVal, howDeny
+
+"<D:unbind/>", howUnbindVal, howDeny
+
+"<D:unlock/>", howUnlockVal, howDeny
+
+//hv.push(new howVals("N", "rPFapcbStysu", "", howNoneVal)); // None is -A
-
-  this. getHows = function(ch) {
@@ -130 +195 @@
-      }
-    }
+
+    alert("No how values for how=" + ch);
-
-    return null;
@@ -180 +247 @@
-  }
-}
+
-// Gather up the how values on access form submission and set the how field
-// (method 1) or return the value (method 2).
@@ -219 +287 @@
-}
-
-
-
-
-
-
-
+
+
+
-  this.who = who;
-  this.whoType = whoType;
+
+  // Don't touch email like addresses
+  if (who.indexOf("@") < 0) {
+    // Normalize the who
+    if (whoType == "user") {
+      if (who.indexOf(principalPrefix) != "0") {
+        who = userPrincipalPrefix + who;
+      }
+    } else if (whoType == "group") {
+      if (who.indexOf(principalPrefix) != "0") {
+        who = groupPrincipalPrefix + who;
+      }
+    } else if (whoType == "resource") {
+      if (who.indexOf(principalPrefix) != "0") {
+        who = resourcePrincipalPrefix + who;
+      }
+    }
+  }
+
+  // format the who string for on-screen display
+  this.format = function() {
+    if (whoType == "user") {
+      return who;
+    }
+
+    if (whoType == "group") {
+      return who;
+    }
+
+    if (whoType == "resource") {
+      return who;
+    }
+
+    if (whoType == "auth") {
+      return authenticatedStr;
+    }
+
+    if (whoType == "unauth") {
+      return unauthenticatedStr;
+    }
+
+    if (whoType == "owner") {
+      return ownerStr;
+    }
+
+    if (whoType == "other") {
+      return otherStr;
+    }
+
+    return "***************" + whoType;
+  }
+
+  this.toXml = function() {
+    var w = this.format();
+
+    if (whoType == "other") {
+      return "    <D:invert>\n        <D:principal><D:owner/></D:principal>\n      </D:invert>";
+    }
+
+    var res = "    <D:principal>\n";
+
+    if (w.indexOf(principalPrefix) == "0") {
+      res += "      <D:href>" + w + "</D:href>\n";
+    } else if (whoType == "auth") {
+      res += "      <D:authenticated/>\n";
+    } else if (whoType == "unauth") {
+      res += "      <D:unauthenticated/>\n";
+    } else if (whoType == "owner") {
+      res += "    <D:property><D:owner/></D:property>\n";
+    } else {
+      res += "************??????" + whoType;
+    }
+
+    return res + "    </D:principal>\n";
+  }
+
+  this.equals = function(pr) {
+    if (this.whoType != pr.whoType) {
+      return false;
+    }
+
+    return this.who == pr.who;
+  }
+}
+
+/* METHOD TWO FUNCTIONS*/
+// Access Control Entry (ACE) object
+
+function bwAce(who, whoType, how, inherited, invert) {
+  this.principal = new bwPrincipal(who, whoType);
-  this.how = how;
-  this.inherited = inherited;
@@ -232 +387 @@
-
-  this.equals = function(ace) {
-
-
-
-
-
+
-  }
-
-  // format the who string for on-screen display
-  this.formatWho = function() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-
@@ -294 +399 @@
-    var formattedHow = "";
-
-
+var 
-      var h = how[i];
+      var negated = false;
-      if (h == "-") {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      } else {
+        if (h == "-") {
+          hi++;
+          h = how[hi];
+        }
+
-        var hvs = hows.getHows(h);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}
@@ -317 +498 @@
-  // The function expects a comma-separated list of arguments grouped
-  // into the five ACE properties.
-whoType,how,inherited,
-whoType,how,inherited,
+ whoType, how, inherited, 
+ whoType, how, inherited, 
-  }
-
@@ -344 +525 @@
-      }
-    }
+
-    // validate for user or group
-    if ((type == 'user' || type == 'group') && formObj.who.value == '') {
@@ -350 +532 @@
-      return;
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // update the acl form field
-    formObj.acl = this.toXml();
-
-    // redraw the display
-    this.display();
-  }
-
-  this.deleteAce = function(index) {
-    bwAcl.aces.splice(index, 1);
-
-    // redraw the display
@@ -382 +572 @@
-      // recreate the table rows
-      for (var j = 0; j < aces.length; j++) {
-
-
+
-        var tr = aclTableBody.insertRow(j);
-
-
-
-
-
-
-
+
-      }
-    } catch (e) {
@@ -400 +584 @@
-  // generate webDAV ACl XML output
-  this.toXml = function() {
-"<acl
+xmlHeader + "\n<D:acl " + nameSpaces + " 
-
-    for (var j = 0; j < aces.length; j++) {
@@ -406 +590 @@
-    }
-
-
-
-
-
-
-
-
+
+
+
+

trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

@@ -35 +35 @@
-  setRecurrence(formObj);
-  setAccessHow(formObj,1);
-
+//
-}
-function setDates(formObj) {