Changeset 1222

Show
Ignore:
Timestamp:
10/16/08 15:40:45 (3 months ago)
Author:
fredj
Message:

sync with trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/camptocamp/MapFishUnhcr/server/python/mapfish/lib/protocol.py

    r1220 r1222  
    125125    def _get_order_by(self, request): 
    126126        """ Return an SA order_by """ 
    127         if 'sort' in request.params and request.params['sort'] in self.mapped_class.__table__.c: 
    128             column = self.mapped_class.__table__.c[request.params['sort']] 
     127        column_name = None 
     128        if 'sort' in request.params: 
     129            column_name = request.params['sort'] 
     130        elif 'order_by' in request.params: 
     131            column_name = request.params['order_by'] 
     132             
     133        if column_name and column_name in self.mapped_class.__table__.c: 
     134            column = self.mapped_class.__table__.c[column_name] 
    129135            if 'dir' in request.params and request.params['dir'].upper() == 'DESC': 
    130136                return desc(column)