[CalendarServer-changes] [15360] CalendarServer/trunk/calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 15360
          http://trac.calendarserver.org//changeset/15360
Author:   cdaboo at apple.com
Date:     2015-12-03 07:32:23 -0800 (Thu, 03 Dec 2015)
Log Message:
-----------
Fix some minor issues with admin resource.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/config.py
    CalendarServer/trunk/calendarserver/webadmin/principals.py
    CalendarServer/trunk/calendarserver/webadmin/principals.xhtml

Modified: CalendarServer/trunk/calendarserver/webadmin/config.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/config.py	2015-12-03 14:53:55 UTC (rev 15359)
+++ CalendarServer/trunk/calendarserver/webadmin/config.py	2015-12-03 15:32:23 UTC (rev 15360)
@@ -29,8 +29,8 @@
 
 from .resource import PageElement, TemplateResource
 
+log = Logger()
 
-
 class ConfigurationPageElement(PageElement):
     """
     Configuration management page element.
@@ -89,6 +89,9 @@
                 if value is None:
                     return u"(no value)"
 
+                if isinstance(value, str):
+                    value = value.decode("utf-8")
+
                 return html.code(unicode(value))
 
             if isinstance(value, list):
@@ -127,7 +130,7 @@
                     name = html.code(namespace)
 
                 value = html.code(
-                    Logger.levels().logLevelForNamespace(
+                    log.levels().logLevelForNamespace(
                         namespace
                     ).name
                 )
@@ -138,7 +141,7 @@
                 )
 
         # FIXME: Using private attributes is bad.
-        namespaces = Logger.levels()._logLevelsByNamespace.keys()
+        namespaces = log.levels()._logLevelsByNamespace.keys()
 
         return rowsForNamespaces(namespaces)
 

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.py	2015-12-03 14:53:55 UTC (rev 15359)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py	2015-12-03 15:32:23 UTC (rev 15360)
@@ -353,8 +353,8 @@
         u"guid": joinWithBR((record.guid,)),
         u"recordType": joinWithBR((record.recordType,)),
         u"shortNames": joinWithBR(record.shortNames),
-        u"fullNames": joinWithBR((record.fullName,)),
+        u"fullNames": joinWithBR(record.fullNames),
         u"emailAddresses": joinWithBR(record.emailAddresses),
         u"calendarUserAddresses": joinWithBR(record.calendarUserAddresses),
-        u"serverID": joinWithBR((record.serverID,)),
+        u"serverURI": joinWithBR((record.serverURI(),)),
     }

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.xhtml	2015-12-03 14:53:55 UTC (rev 15359)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.xhtml	2015-12-03 15:32:23 UTC (rev 15360)
@@ -33,6 +33,8 @@
           <th class="record_type">Record Type</th>
           <th class="record_short_name">Short Name</th>
           <th class="record_email">Email Address</th>
+          <th class="record_calendaruseraddress">Calendar User Address</th>
+          <th class="record_serveruri">Server</th>
         </tr>
       </thead>
       <tbody>
@@ -42,6 +44,8 @@
           <td class="record_type"><t:slot name="recordType" /></td>
           <td class="record_short_name"><t:slot name="shortNames" /></td>
           <td class="record_email"><t:slot name="emailAddresses" /></td>
+          <td class="record_calendaruseraddress"><t:slot name="calendarUserAddresses" /></td>
+          <td class="record_serveruri"><t:slot name="serverURI" /></td>
         </tr>
       </tbody>
     </table>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151203/c5e4a81c/attachment.html>