pferreir

commit f7db3494498071b2407fab388b2a058ac4835234
Author: Pedro Ferreira <pedro.ferreira@cern.ch>
Date:   Wed Aug 20 17:39:20 2014 +0200

    Avoid resetting loggers
    
    Which creates problems with the scheduler's own logger

diff --git a/indico/core/logger.py b/indico/core/logger.py
index ef3a06f..c620264 100644

pferreir

commit c55a73f57db19b3dece132d8041803b41cb20a29
Author: Pedro Ferreira <pedro.ferreira@cern.ch>
Date:   Wed Aug 20 18:50:45 2014 +0200

    Log Janitor delete operations with specific avatar

diff --git a/etc/indico.conf.sample b/etc/indico.conf.sample
index 6fe62b3..0792733 100644
--- a/etc/indico.conf.sample
+++ b/etc/indico.conf.sample

pferreir

diff --git a/indico/web/http_api/handlers.py b/indico/web/http_api/handlers.py
index 712cbc8..2de3935 100644
--- a/indico/web/http_api/handlers.py
+++ b/indico/web/http_api/handlers.py
@@ -280,7 +280,7 @@ def handler(prefix, path):
         if error is None and request.method == 'POST':
             logger.info('API request: %s?%s' % (path, query))
 
-        serializer = Serializer.create(dformat, pretty=pretty, typeMap=typeMap,
+        serializer = Serializer.create(dformat, query_params=queryParams, pretty=pretty, typeMap=typeMap,

pferreir

diff --git a/indico/web/http_api/handlers.py b/indico/web/http_api/handlers.py
index 712cbc8..2de3935 100644
--- a/indico/web/http_api/handlers.py
+++ b/indico/web/http_api/handlers.py
@@ -280,7 +280,7 @@ def handler(prefix, path):
         if error is None and request.method == 'POST':
             logger.info('API request: %s?%s' % (path, query))
 
-        serializer = Serializer.create(dformat, pretty=pretty, typeMap=typeMap,
+        serializer = Serializer.create(dformat, query_params=queryParams, pretty=pretty, typeMap=typeMap,

pferreir

commit 4a76b1b5063c6ac27eb2b52834fe913bc0223a4c
Author: Pedro Ferreira <pedro.ferreira@cern.ch>
Date:   Fri Aug 22 16:01:46 2014 +0200

    Allow definitions to be overridden per-host

diff --git a/fabfile.py b/fabfile.py
index b1a897f..5ebf2fe 100644
--- a/fabfile.py
+++ b/fabfile.py

pferreir

Priorities

• p-critical
• p-blocker
• p-essential
• p-medium
• p-desirable
• p-minor

Status

• infoneeded

pferreir

[loggers]
keys=root

[handlers]
keys=indico,other,smtp

[formatters]
keys=defaultFormatter,mailFormatter

# For deactivating a handler, remove its entry from

pferreir

diff --git a/indico/modules/rb/controllers/user/reservations.py b/indico/modules/rb/controllers/user/reservations.py
index a35872a..5c9d64e 100644
--- a/indico/modules/rb/controllers/user/reservations.py
+++ b/indico/modules/rb/controllers/user/reservations.py
@@ -427,15 +427,19 @@ class RHRoomBookingCloneBooking(RHRoomBookingBookingMixin, RHRoomBookingNewBooki
         return RHRoomBookingNewBookingSimple._get_view(self, clone_booking=self._reservation, **kwargs)
 
     def _make_form(self):
-        defaults = FormDefaults(
-            self._reservation,

pferreir

diff --git a/indico/modules/rb/api.py b/indico/modules/rb/api.py
index a3a9e28..8fef315 100644
--- a/indico/modules/rb/api.py
+++ b/indico/modules/rb/api.py
@@ -22,7 +22,7 @@ from datetime import datetime
 import icalendar
 import pytz
 from babel.dates import get_timezone
-from sqlalchemy import Time, Date
+from sqlalchemy import Time, Date, or_

pferreir

diff --git a/indico/MaKaC/user.py b/indico/MaKaC/user.py
index a234469..d9a0a07 100644
--- a/indico/MaKaC/user.py
+++ b/indico/MaKaC/user.py
@@ -402,12 +402,7 @@ class Avatar(Persistent, Fossilizable):
             if 'title' in userData:
                 self.setTitle(userData["title"])
             if 'organisation' in userData:
-                if len(userData["organisation"])>0:
-                    for org in userData["organisation"]: