Permalink
Browse files

Merge branch 'master' of git://github.com/Suberri/Open-Knesset

  • Loading branch information...
2 parents df6734c + 17e4af2 commit 4cc2184ab359588d51031440722357ea8dd479a7 @MeirKriheli MeirKriheli committed Mar 7, 2013
Showing with 8 additions and 8 deletions.
  1. +2 −2 auxiliary/api.py
  2. +1 −1 events/api.py
  3. +1 −1 links/api.py
  4. +3 −3 mks/api.py
  5. +1 −1 polyorg/api.py
View
@@ -24,7 +24,7 @@
class PostResource(BaseResource):
- class Meta:
+ class Meta(BaseResource.Meta):
limit = 50
allowed_methods = ['get']
fields = ['id', 'title', 'date_created', 'url', 'content']
@@ -61,7 +61,7 @@ class TagResource(BaseResource):
number_of_items = fields.IntegerField()
absolute_url = fields.CharField()
- class Meta:
+ class Meta(BaseResource.Meta):
queryset = Tag.objects.all().order_by('name')
allowed_methods = ['get']
include_absolute_url = True
View
@@ -8,7 +8,7 @@
from django.conf.urls.defaults import url
class EventResource(BaseResource):
- class Meta:
+ class Meta(BaseResource.Meta):
queryset = Event.objects.all()
allowed_methods = ['get']
View
@@ -4,7 +4,7 @@
class LinkResource(BaseResource):
''' Link API
'''
- class Meta:
+ class Meta(BaseResource.Meta):
queryset = Link.objects.select_related('link_type')
allowed_methods = ['get']
excludes = ["active", "object_pk", "id"]
View
@@ -25,7 +25,7 @@ class PartyResource(BaseResource):
TBD: create a party app
'''
- class Meta:
+ class Meta(BaseResource.Meta):
queryset = Party.objects.filter(
knesset=Knesset.objects.current_knesset())
allowed_methods = ['get']
@@ -38,7 +38,7 @@ def __init__(self, **entries):
class MemberBillsResource(BaseResource):
- class Meta:
+ class Meta(BaseResource.Meta):
allowed_methods = ['get']
resource_name = "member-bills"
# object_class= DictStruct
@@ -100,7 +100,7 @@ class MemberAgendasResource(BaseResource):
agendas = fields.ListField()
- class Meta:
+ class Meta(BaseResource.Meta):
queryset = Member.objects.select_related('current_party').order_by()
allowed_methods = ['get']
fields = ['agendas'] # We're not really interested in any member details here
View
@@ -16,7 +16,7 @@ class CandidateListResource(BaseResource):
TBD: create a party app
'''
- class Meta:
+ class Meta(BaseResource.Meta):
queryset = CandidateList.objects.all()
allowed_methods = ['get']
excludes = ['end_date', 'start_date']

0 comments on commit 4cc2184

Please sign in to comment.