[CalendarServer-changes] [2335]
CalendarServer/trunk/twistedcaldav/admin/principals.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Apr 22 12:28:18 PDT 2008
Revision: 2335
http://trac.macosforge.org/projects/calendarserver/changeset/2335
Author: cdaboo at apple.com
Date: 2008-04-22 12:28:16 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
Reinstate a change that checks whether the calendar home exists or not.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/admin/principals.py
Modified: CalendarServer/trunk/twistedcaldav/admin/principals.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/principals.py 2008-04-22 19:22:45 UTC (rev 2334)
+++ CalendarServer/trunk/twistedcaldav/admin/principals.py 2008-04-22 19:28:16 UTC (rev 2335)
@@ -66,21 +66,35 @@
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()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080422/41d215ec/attachment.html
More information about the calendarserver-changes
mailing list