[CalendarServer-changes] [15669] CalendarServer/trunk/calendarserver/webadmin/delegation.py

source_changes at macosforge.org source_changes at macosforge.org
Sat Jun 11 11:24:25 PDT 2016


Revision: 15669
          http://trac.calendarserver.org//changeset/15669
Author:   sagen at apple.com
Date:     2016-06-11 11:24:25 -0700 (Sat, 11 Jun 2016)
Log Message:
-----------
getAutoScheduleMode is asynchronous, so add inlineCallbacks/yield

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/delegation.py

Modified: CalendarServer/trunk/calendarserver/webadmin/delegation.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/delegation.py	2016-06-10 18:48:17 UTC (rev 15668)
+++ CalendarServer/trunk/calendarserver/webadmin/delegation.py	2016-06-11 18:24:25 UTC (rev 15669)
@@ -293,102 +293,99 @@
 
 
     @renderer
+    @inlineCallbacks
     def isAutoSchedule(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag if the resource
         is auto-schedule.
         """
-        if self.principalResource.getAutoScheduleMode() is not AutoScheduleMode.none:
+        if (yield self.principalResource.getAutoScheduleMode()) is not AutoScheduleMode.none:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
 
     @renderer
+    @inlineCallbacks
     def isntAutoSchedule(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag if the resource
         is not auto-schedule.
         """
-        if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.none:
+        if (yield self.principalResource.getAutoScheduleMode()) is AutoScheduleMode.none:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
 
-    # @renderer
-    # def autoScheduleModeDefault(self, request, tag):
-    #     """
-    #     Renderer which sets the 'selected' attribute on its tag based on the resource
-    #     auto-schedule-mode.
-    #     """
-    #     if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.default:
-    #         tag(selected='selected')
-    #     return tag
-
-
     @renderer
+    @inlineCallbacks
     def autoScheduleModeNone(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag based on the resource
         auto-schedule-mode.
         """
-        if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.none:
+        if (yield self.principalResource.getAutoScheduleMode()) is AutoScheduleMode.none:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
 
     @renderer
+    @inlineCallbacks
     def autoScheduleModeAcceptAlways(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag based on the resource
         auto-schedule-mode.
         """
-        if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.accept:
+        if (yield self.principalResource.getAutoScheduleMode()) is AutoScheduleMode.accept:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
 
     @renderer
+    @inlineCallbacks
     def autoScheduleModeDeclineAlways(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag based on the resource
         auto-schedule-mode.
         """
-        if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.decline:
+        if (yield self.principalResource.getAutoScheduleMode()) is AutoScheduleMode.decline:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
 
     @renderer
+    @inlineCallbacks
     def autoScheduleModeAcceptIfFree(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag based on the resource
         auto-schedule-mode.
         """
-        if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.acceptIfFree:
+        if (yield self.principalResource.getAutoScheduleMode()) is AutoScheduleMode.acceptIfFree:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
 
     @renderer
+    @inlineCallbacks
     def autoScheduleModeDeclineIfBusy(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag based on the resource
         auto-schedule-mode.
         """
-        if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.declineIfBusy:
+        if (yield self.principalResource.getAutoScheduleMode()) is AutoScheduleMode.declineIfBusy:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
 
     @renderer
+    @inlineCallbacks
     def autoScheduleModeAutomatic(self, request, tag):
         """
         Renderer which sets the 'selected' attribute on its tag based on the resource
         auto-schedule-mode.
         """
-        if self.principalResource.getAutoScheduleMode() is AutoScheduleMode.acceptIfFreeDeclineIfBusy:
+        if (yield self.principalResource.getAutoScheduleMode()) is AutoScheduleMode.acceptIfFreeDeclineIfBusy:
             tag(selected='selected')
-        return tag
+        returnValue(tag)
 
     _matrix = None
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160611/a08c8867/attachment.html>


More information about the calendarserver-changes mailing list