[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [2336]
From: source_changes () macosforge ! org
Date: 2008-04-22 21:13:32
Message-ID: 20080422211332.BF63015CCADD () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 2336
http://trac.macosforge.org/projects/calendarserver/changeset/2336
Author: wsanchez@apple.com
Date: 2008-04-22 14:13:31 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
Pull up r2332, r2335: caladmin's per-user stats wrong
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py
Modified: CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py 2008-04-22 \
19:28:16 UTC (rev 2335)
+++ CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py 2008-04-22 \
21:13:31 UTC (rev 2336) @@ -63,26 +63,40 @@
precord = {}
pcal = self.calendarCollection.child(
- self.type
+ "__uids__"
).child(p.basename())
precord['principalName'] = p.basename()
- precord['calendarHome'] = pcal.path
-
- precord.update(
- util.getQuotaStatsForPrincipal(
- self.config,
- pcal,
- self.quota))
-
- precord.update(
- util.getCalendarDataCounts(pcal))
-
- precord['diskUsage'] = util.getDiskUsage(self.config, pcal)
-
- precord['disabled'] = util.isPrincipalDisabled(p)
-
+ if pcal.exists():
+ precord['calendarHome'] = pcal.path
+
+ precord.update(
+ util.getQuotaStatsForPrincipal(
+ self.config,
+ pcal,
+ self.quota))
+
+ precord.update(
+ util.getCalendarDataCounts(pcal))
+
+ precord['diskUsage'] = util.getDiskUsage(self.config, pcal)
+
+ precord['disabled'] = util.isPrincipalDisabled(p)
+ else:
+ precord.update({
+ 'calendarHome': "-",
+ 'quotaRoot': "-",
+ 'quotaUsed': "-",
+ 'quotaAvail': "-",
+ 'quotaFree': "-",
+ 'calendarCount': "-",
+ 'eventCount': "-",
+ 'todoCount': "-",
+ 'diskUsage': "-",
+ 'disabled': "-",
+ })
+
yield precord
report['records'] = _getRecords()
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style \
type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: \
6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<title>[2336] CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav
/admin/principals.py</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/calendarserver/changeset/2336">2336</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2008-04-22 14:13:31 -0700 (Tue, 22 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pull up r2332, r2335: caladmin's per-user stats wrong</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer13devtwistedcaldavadminprinci \
palspy">CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer13devtwistedcaldavadminprincipalspy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py \
(2335 => 2336)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py 2008-04-22 \
19:28:16 UTC (rev 2335)
+++ CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/admin/principals.py 2008-04-22 \
21:13:31 UTC (rev 2336) </span><span class="lines">@@ -63,26 +63,40 @@
</span><span class="cx"> precord = {}
</span><span class="cx">
</span><span class="cx"> pcal = self.calendarCollection.child(
</span><del>- self.type
</del><ins>+ "__uids__"
</ins><span class="cx"> ).child(p.basename())
</span><span class="cx">
</span><span class="cx"> precord['principalName'] = p.basename()
</span><span class="cx">
</span><del>- precord['calendarHome'] = pcal.path
-
- precord.update(
- util.getQuotaStatsForPrincipal(
- self.config,
- pcal,
- self.quota))
-
- precord.update(
- util.getCalendarDataCounts(pcal))
-
- precord['diskUsage'] = util.getDiskUsage(self.config, pcal)
-
- precord['disabled'] = util.isPrincipalDisabled(p)
-
</del><ins>+ if pcal.exists():
+ precord['calendarHome'] = pcal.path
+
+ precord.update(
+ util.getQuotaStatsForPrincipal(
+ self.config,
+ pcal,
+ self.quota))
+
+ precord.update(
+ util.getCalendarDataCounts(pcal))
+
+ precord['diskUsage'] = util.getDiskUsage(self.config, pcal)
+
+ precord['disabled'] = util.isPrincipalDisabled(p)
+ else:
+ precord.update({
+ 'calendarHome': "-",
+ 'quotaRoot': "-",
+ 'quotaUsed': "-",
+ 'quotaAvail': "-",
+ 'quotaFree': "-",
+ 'calendarCount': "-",
+ 'eventCount': "-",
+ 'todoCount': "-",
+ 'diskUsage': "-",
+ 'disabled': "-",
+ })
+
</ins><span class="cx"> yield precord
</span><span class="cx">
</span><span class="cx"> report['records'] = _getRecords()
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic