Changeset a3fc2e in indico for indico/web/http_api/api.py

Timestamp:

09/19/11 14:40:44 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 10eafd9ae230cbad5d99d5aaf22c24724fb6c98f

Children:

2cb1cc

Parents:

03c6d2d (diff), b2a7f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'v0.98b2' into v0.98-series

Conflicts:

indico/web/http_api/api.py
indico/web/http_api/handlers.py

File:

• indico/web/http_api/api.py (modified) (6 diffs)

indico/web/http_api/api.py

@@ -45 +45 @@
 from indico.web.http_api.fossils import IConferenceMetadataFossil,\
     IConferenceMetadataWithContribsFossil, IConferenceMetadataWithSubContribsFossil,\
-    IConferenceMetadataWithSessionsFossil, IPeriodFossil
+    IConferenceMetadataWithSessionsFossil, IPeriodFossil, ICategoryMetadataFossil,\
+    ICategoryProtectedMetadataFossil
 from indico.web.http_api.responses import HTTPAPIError
 from indico.web.wsgi import webinterface_handler_config as apache
@@ -51 +52 @@
 # indico legacy imports
 from MaKaC.common.db import DBMgr
+from MaKaC.conference import CategoryManager
 from MaKaC.common.indexes import IndexesHolder
 from MaKaC.common.info import HelperMaKaCInfo
@@ -204 +206 @@
             raise NotImplementedError(self.PREFIX + '_' + self._type)
 
+        extraFunc = getattr(self, self.PREFIX + '_' + self._type + '_extra', None)
+        extra = extraFunc(aw) if extraFunc else None
+
         if not self.COMMIT:
             # Just execute the function, we'll never have to repeat it
@@ -222 +227 @@
                 raise HTTPAPIError('An unresolvable database conflict has occured', apache.HTTP_INTERNAL_SERVER_ERROR)
 
-        return resultList, complete, self.SERIALIZER_TYPE_MAP
+        return resultList, extra, complete, self.SERIALIZER_TYPE_MAP
 
 
@@ -408 +413 @@
         return expInt.category(self._idList)
 
+    def export_categ_extra(self, aw):
+        return {
+            'categHierarchy': CategoryEventFetcher.getCategoryPath(self._idList, aw)
+        }
+
     def export_event(self, aw):
         expInt = CategoryEventFetcher(aw, self)
@@ -429 +439 @@
     def _postprocess(self, obj, fossil, iface):
         return self._addOccurrences(fossil, obj, self._fromDT, self._toDT)
+
+    @classmethod
+    def getCategoryPath(cls, idList, aw):
+        paths = {}
+        for id in idList:
+            paths['categ_' + id] = cls._getCategoryPath(id, aw)
+        return paths
+
+    @staticmethod
+    def _getCategoryPath(id, aw):
+        path = []
+        cat = CategoryManager().getById(id)
+        while cat:
+            iface = ICategoryMetadataFossil if cat.canAccess(aw) else ICategoryProtectedMetadataFossil
+            path.append(fossilize(cat, iface))
+            cat = cat.getOwner()
+        path.reverse()
+        return path
 
     @staticmethod