Changeset 94fff24f37b433dbb078153fdcfba0d9eb58898d in indico

Timestamp:

02/02/12 11:53:11 (4 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Children:

3a3b0559117b8fa0bd787c535d5cf4c1675f32e1

Parents:

9fe579e305fa5c222040f95e217f038c13fc87db

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/02/12 11:53:11)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/15/12 17:19:47)

Message:

[FIX] Contribution export not working

Files:

• bin/utils/proposeAbstractsToAccept.py (modified) (2 diffs)
• indico/MaKaC/services/implementation/category.py (modified) (1 diff)
• indico/MaKaC/services/implementation/user.py (modified) (2 diffs)
• indico/MaKaC/webinterface/tpls/ICalExportCommon.tpl (modified) (2 diffs)
• indico/web/http_api/api.py (modified) (2 diffs)
• indico/web/http_api/fossils.py (modified) (1 diff)
• indico/web/http_api/handlers.py (modified) (1 diff)
• indico/web/http_api/ical.py (modified) (4 diffs)

bin/utils/proposeAbstractsToAccept.py

@@ -26 +26 @@
 
 """
-Propose  to be accepted the abstracts with status submitted of a track
+Change all submitted abstracts to "propose to be accepted" status
 """
 
 DBMgr.getInstance().startRequest()
-error = False
 
 confId = '149557'
@@ -46 +45 @@
         abstract.proposeToAccept(user, track, contribType)
 
-if not error:
-    DBMgr.getInstance().endRequest()
-    print "No error. The change are saved"
-else:
-    print "There were errors. The changes was not saved"
+DBMgr.getInstance().endRequest()

indico/MaKaC/services/implementation/category.py

@@ -336 +336 @@
     "protection.removeManager": CategoryRemoveControlUser,
     "protection.addExistingConfCreator": CategoryAddExistingControlUser,
-    "protection.removeConfCreator": CategoryRemoveControlUser
+    "protection.removeConfCreator": CategoryRemoveControlUser,
     "api.getExportURLs": CategoryExportURLs
     }

indico/MaKaC/services/implementation/user.py

@@ -466 +466 @@
         if ak and ak.isBlocked():
             raise ServiceAccessError((_("The API Key is blocked")))
-    def _getAnswer( self):
+
+    def _getAnswer(self):
         ak = self._avatar.getAPIKey()
         ak.setPersistentAllowed(not ak.isPersistentAllowed())
         return ak.isPersistentAllowed()
 
-class UserCreateKeyAndEnablePersistentSignatures(LoggedOnlyService):
+class UserCreateKeyEnablePersistent(LoggedOnlyService):
 
     def _checkParams(self):
@@ -508 +509 @@
     "syncPersonalData": UserSyncPersonalData,
     "togglePersistentSignatures": UserSetPersistentSignatures,
-    "createKeyAndEnablePersistent": UserCreateKeyAndEnablePersistentSignatures
+    "createKeyAndEnablePersistent": UserCreateKeyEnablePersistent
 }

indico/MaKaC/webinterface/tpls/ICalExportCommon.tpl

@@ -3 +3 @@
     <div id="agreementApiKey">
         <div id="agreementApiKeyText" class="agreement">
-            ${_("""You need to create an HTTP API key in order to retrieve the information from the HTTP API. You can clicking in the button below or in <a href="%s" target="_blank">My Profile</a> where you can also manage it.""")%(urlHandlers.UHUserAPI.getURL(self_._aw.getUser()))}
+            ${_("""You need to create an HTTP API key in order to retrieve the information from the HTTP API. You can do so by accepting the agreement below or from <a href="%s" target="_blank">My Profile</a>, where you can also manage it.""") % (urlHandlers.UHUserAPI.getURL(self_._aw.getUser()))}
         </div>
-        <input type="checkbox" id="agreeCheckBoxKey"> ${("I red the agreement.")}
+        <input type="checkbox" id="agreeCheckBoxKey"> ${("I read the agreement.")}
         <input id="agreementButtonKey" type="submit" value="Agree" disabled="disabled"/>
         <div style="display:inline;" id="progressPersistentKey"></div>
@@ -13 +13 @@
             <div>${apiPersistentEnableAgreement}</div>
         </div>
-        <input type="checkbox" id="agreeCheckBoxPersistent"> ${("I red the agreement.")}
+        <input type="checkbox" id="agreeCheckBoxPersistent"> ${("I read the agreement.")}
         <input id="agreementButtonPersistent" type="submit" value="Agree" disabled="disabled"/>
         <div style="display:inline;" id="progressPersistentSignatures"></div>

indico/web/http_api/api.py

@@ -380 +380 @@
 
     def _process(self, iterator, filter=None, iface=None):
+        print 'process'
         if iface is None:
             iface = self.DETAIL_INTERFACES.get(self._detail)
@@ -511 +512 @@
 
     def event(self, idlist):
+        print 'event'
         ch = ConferenceHolder()
 

indico/web/http_api/fossils.py

@@ -259 +259 @@
     getType.convert = lambda t: t and t.getName()
 
+    def getLocator(self):
+        pass
+    getLocator.convert = Conversion.url(urlHandlers.UHContributionDisplay)
+    getLocator.name = 'url'
+
 
 class ISubContributionMetadataFossil(IFossil):

indico/web/http_api/handlers.py

@@ -246 +246 @@
             else:
                 req.headers_out['Content-Type'] = serializer.getMIMEType()
-
+            print resultFossil
             return serializer(resultFossil)
         except:

indico/web/http_api/ical.py

@@ -52 +52 @@
 
 
-@staticmethod
-def serialize_conference(fossil, now):
+def serialize_event(self, fossil, now, id_prefix="indico-event"):
     event = ical.Event()
-    event.set('uid', 'indico-event-%s@cern.ch' % fossil['id'])
+    event.set('uid', '%s-%s@cern.ch' % (id_prefix, fossil['id']))
     event.set('dtstamp', now)
     event.set('dtstart', fossil['startDate'])
     event.set('dtend', fossil['endDate'])
     event.set('url', fossil['url'])
-    event['summary'] = fossil['title']
-    loc = fossil['location'] or ''
+    event.set('summary', fossil['title'].decode('utf-8'))
+    loc = fossil['location'].decode('utf-8') or ''
     if fossil['room']:
-        loc += ' ' + fossil['room']
-    event['location'] = loc
+        loc += ' ' + fossil['room'].decode('utf-8')
+    event.set('location', loc)
     if fossil['description']:
-        event['description'] = fossil['description'] + '\n' + fossil['url']
+        event.set('description', fossil['description'].decode('utf-8') + '\n' + fossil['url'])
     else:
-        event['description'] = fossil['url']
+        event.set('description', fossil['url'])
     return event
 
 
-@staticmethod
 def serialize_repeatability(startDT, endDT, repType):
     intervals = { RepeatabilityEnum.onceAWeek: 1, RepeatabilityEnum.onceEvery2Weeks: 2, RepeatabilityEnum.onceEvery3Weeks: 3 }
@@ -96 +94 @@
     event.set('url', fossil['bookingUrl'])
     event.set('summary', fossil['reason'])
-    event['location'] = fossil['location'] + ': ' + fossil['room']['fullName']
-    event['description'] = fossil['reason'] + '\n' + fossil['bookingUrl']
+    event.set('location', fossil['location'].decode('utf-8') + ': ' + fossil['room']['fullName'].decode('utf-8'))
+    event.set('description', fossil['reason'].decode('utf-8') + '\n' + fossil['bookingUrl'])
     rrule = None
     if fossil['repeatability'] is not None:
@@ -106 +104 @@
 
 
+def serialize_contribs(fossil, now):
+    for sfossil in fossil['contributions']:
+        if sfossil['startDate']:
+            sfossil['id'] = "%s-%s" % (fossil['id'], sfossil['id'])
+            cal.add_component(serialize_event(sfossil, now, id_prefix="indico-contribution"))
+
+
 class ICalSerializer(Serializer):
 
@@ -112 +117 @@
 
     _mappers = {
-        'conferenceMetadata': serialize_conference,
-        'reservationMetadata': serialize_reservation
+        'conferenceMetadata': serialize_event,
+        'reservationMetadata': serialize_reservation,
+        'conferenceMetadataWithContribs': serialize_contribs
     }