diff options
Diffstat (limited to 'src/meetingtools/apps/room/views.py')
| -rw-r--r-- | src/meetingtools/apps/room/views.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/meetingtools/apps/room/views.py b/src/meetingtools/apps/room/views.py index d0c5f37..3bbc74a 100644 --- a/src/meetingtools/apps/room/views.py +++ b/src/meetingtools/apps/room/views.py @@ -395,26 +395,18 @@ def widget(request,tn): title = 'Rooms tagged with %s' % " and ".join(tags) now = timeAsrfc822( datetime.now() ) return respond_to(request, - {'text/html':'apps/room/widget-test.html', - 'application/json': json_response([_room2dict(room) for room in rooms]), - 'application/rss+xml': 'apps/room/rss2.xml', - 'text/rss': 'apps/room/rss2.xml'}, - {'title':title,'description':title ,'edit':False,'date': now,'tags': tn,'rooms': [_room2dict(room) for room in rooms.all()]}) + {'text/html':'apps/room/widget-test.html'}, + {'title':title,'description':title ,'edit':False,'date': now,'tags': tn,'rooms':rooms.all()}) # should not require login def list_by_tag(request,tn): tags = tn.split('+') rooms = TaggedItem.objects.get_by_model(Room, tags) title = 'Rooms tagged with %s' % " and ".join(tags) - now = rfc3339_date(datetime.now()) - now822 = timeAsrfc822( datetime.now() ) return respond_to(request, {'text/html':'apps/room/list.html', - 'application/json': json_response([_room2dict(room) for room in rooms]), - 'application/atom+xml': 'apps/room/atom.xml', - 'application/rss+xml': 'apps/room/rss2.xml', - 'text/rss': 'apps/room/rss2.xml'}, - {'title':title,'description':title ,'edit':False,'baseurl': BASE_URL,'rfc3339_date': now,'rfc822_date': now822,'tags': tn,'rooms':[_room2dict(room) for room in rooms.all()]}) + 'application/json': json_response([_room2dict(room) for room in rooms])}, + {'title':title,'description':title ,'edit':False,'baseurl': BASE_URL,'tags': tn,'rooms':rooms.all()}) def _can_tag(request,tag): if tag in ('selfcleaning','public','private'): |