<!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" />
<title>[12842] CalendarServer/trunk/calendarserver/webadmin</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12842">12842</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-07 12:24:02 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Show additional attributes on items.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkpy">CalendarServer/trunk/calendarserver/webadmin/work.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkxhtml">CalendarServer/trunk/calendarserver/webadmin/work.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.py (12841 => 12842)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.py 2014-03-07 20:23:39 UTC (rev 12841)
+++ CalendarServer/trunk/calendarserver/webadmin/work.py 2014-03-07 20:24:02 UTC (rev 12842)
</span><span class="lines">@@ -33,16 +33,17 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> # from twisted.web.template import tags as html, renderer
</span><span class="cx">
</span><del>-# from txdav.caldav.datastore.scheduling.imip.inbound import (
-# IMIPPollingWork, IMIPReplyWork
-# )
</del><ins>+from txdav.caldav.datastore.scheduling.imip.inbound import (
+ IMIPPollingWork, IMIPReplyWork
+)
</ins><span class="cx">
</span><del>-# from twistedcaldav.directory.directory import GroupCacherPollingWork
-# from calendarserver.push.notifier import PushNotificationWork
</del><ins>+from txdav.who.groups import GroupCacherPollingWork
+from calendarserver.push.notifier import PushNotificationWork
</ins><span class="cx">
</span><del>-# from txdav.caldav.datastore.scheduling.work import (
-# ScheduleOrganizerWork, ScheduleReplyWork, ScheduleRefreshWork
-# )
</del><ins>+from txdav.caldav.datastore.scheduling.work import (
+ ScheduleOrganizerWork, ScheduleRefreshWork,
+ ScheduleReplyWork, ScheduleAutoReplyWork,
+)
</ins><span class="cx">
</span><span class="cx"> from twext.enterprise.jobqueue import JobItem
</span><span class="cx">
</span><span class="lines">@@ -110,32 +111,60 @@
</span><span class="cx">
</span><span class="cx"> events = []
</span><span class="cx">
</span><del>- itemsByTypeName = {}
</del><ins>+ jobsByTypeName = {}
</ins><span class="cx">
</span><del>- for item in (yield JobItem.all(txn)):
- itemsByTypeName.setdefault(item.workType, []).append(item)
</del><ins>+ for job in (yield JobItem.all(txn)):
+ jobsByTypeName.setdefault(job.workType, []).append(job)
</ins><span class="cx">
</span><span class="cx"> totalsByTypeName = {}
</span><span class="cx">
</span><span class="cx"> for workType in JobItem.workTypes():
</span><span class="cx"> typeName = workType.table.model.name
</span><del>- items = itemsByTypeName.get(typeName, [])
- totalsByTypeName[typeName] = len(items)
- itemData = []
</del><ins>+ jobs = jobsByTypeName.get(typeName, [])
+ totalsByTypeName[typeName] = len(jobs)
</ins><span class="cx">
</span><del>- for item in items:
- itemData.append(dict(
- jobID=item.jobID,
- priority=item.priority,
- notBefore=item.notBefore.ctime(), # FIXME: Use HTTP format
- notAfter=item.notAfter,
- ))
</del><ins>+ jobDicts = []
</ins><span class="cx">
</span><del>- if itemData:
</del><ins>+ for job in jobs:
+ jobDict = dict(
+ jobID=job.jobID,
+ priority=job.priority,
+ notBefore=job.notBefore.ctime(), # FIXME: Use HTTP format
+ notAfter=job.notAfter,
+ )
+
+ work = yield job.workItem()
+
+ if work is not None:
+ if workType == PushNotificationWork:
+ attrs = ("pushID", "priority")
+ elif workType == ScheduleOrganizerWork:
+ attrs = ("icalendarUid", "attendeeCount")
+ elif workType == ScheduleRefreshWork:
+ attrs = ("icalendarUid", "attendeeCount")
+ elif workType == ScheduleReplyWork:
+ attrs = ("icalendarUid",)
+ elif workType == ScheduleAutoReplyWork:
+ attrs = ("icalendarUid",)
+ elif workType == GroupCacherPollingWork:
+ attrs = ()
+ elif workType == IMIPPollingWork:
+ attrs = ()
+ elif workType == IMIPReplyWork:
+ attrs = ("organizer", "attendee")
+ else:
+ attrs = ()
+
+ for attr in attrs:
+ jobDict["work_{}".format(attr)] = getattr(work, attr)
+
+ jobDicts.append(jobDict)
+
+ if jobDicts:
</ins><span class="cx"> events.append(dict(
</span><span class="cx"> eventClass=typeName,
</span><span class="cx"> eventID=time(),
</span><del>- eventText=asJSON(itemData),
</del><ins>+ eventText=asJSON(jobDicts),
</ins><span class="cx"> ))
</span><span class="cx">
</span><span class="cx"> events.append(dict(
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (12841 => 12842)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-03-07 20:23:39 UTC (rev 12841)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-03-07 20:24:02 UTC (rev 12842)
</span><span class="lines">@@ -92,9 +92,19 @@
</span><span class="cx">
</span><span class="cx"> var jobItemAttributeDescriptions = {
</span><span class="cx"> "jobID": "Job ID",
</span><del>- "priority": "Priority",
</del><ins>+ "priority": "Job Priority",
</ins><span class="cx"> "notBefore": "Not Before",
</span><span class="cx"> "notAfter": "Not After",
</span><ins>+
+ // Push
+ "work_pushID": "Push ID",
+ "work_priority": "Priority",
+
+ // Scheduling
+ "work_icalendarUid": "iCalendar UID",
+ "work_attendeeCount": "Attendee Count",
+ "work_organizer": "Organizer",
+ "work_attendee": "Attendee",
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Function to return keys from an object in order, followed by keys
</span><span class="lines">@@ -104,7 +114,7 @@
</span><span class="cx"> // will be in whatever order they came in over the wire.
</span><span class="cx"> function keysInKindOfKnownOrder(obj1, obj2) {
</span><span class="cx"> var keys = [];
</span><del>- for (var key in obj1) { keys.push(key); }
</del><ins>+ for (var key in obj1) { if (key in obj2) { keys.push(key); } }
</ins><span class="cx"> for (var key in obj2) { if (! key in obj1) { keys.push(key); } }
</span><span class="cx"> return keys;
</span><span class="cx"> }
</span><span class="lines">@@ -396,8 +406,12 @@
</span><span class="cx"> for (var i in attributes) {
</span><span class="cx"> var attribute = attributes[i]; // OMG JavaScript the lameness
</span><span class="cx">
</span><ins>+ var content = jobItem[attribute]
+ if (content === null) { content = ""; }
+
</ins><span class="cx"> var cell = document.createElement("td");
</span><del>- var text = document.createTextNode(jobItem[attribute]);
</del><ins>+ var text = document.createTextNode(content);
+
</ins><span class="cx"> cell.appendChild(text);
</span><span class="cx"> row.appendChild(cell);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>