[#141] Merge branch 'develop' into feature/141_primary_locations

akvo/api/authentication.py

@@ -4,7 +4,7 @@
 # See more details in the license.txt file located at the root folder of the Akvo RSR module.
 # For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 
 from tastypie.authentication import ApiKeyAuthentication
@@ -41,8 +41,8 @@ def is_authenticated(self, request, **kwargs):
             return self._unauthorized()
 
         try:
-            user = User.objects.get(username=username)
-        except (User.DoesNotExist, User.MultipleObjectsReturned):
+            user = get_user_model().objects.get(username=username)
+        except (get_user_model().DoesNotExist, get_user_model().MultipleObjectsReturned):
             return self._unauthorized()
 
         request.user = user

akvo/api/resources/__init__.py

@@ -12,6 +12,7 @@
 from .focus_area import FocusAreaResource
 from .goal import GoalResource, IATIGoalResource
 from .invoice import InvoiceResource
+from .keyword import KeywordResource
 from .link import LinkResource
 from .location import (
     IATIProjectLocationResource, OrganisationLocationResource, OrganisationMapLocationResource,
@@ -44,6 +45,7 @@
     'IATIProjectLocationResource',
     'IATIProjectResource',
     'InvoiceResource',
+    'KeywordResource',
     'LinkResource',
     'OrganisationResource',
     'OrganisationLocationResource',

akvo/api/resources/keyword.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import Keyword
+
+from .resources import ConditionalFullResource
+
+
+class KeywordResource(ConditionalFullResource):
+    class Meta:
+        allowed_methods = ['get']
+        queryset        = Keyword.objects.all()
+        resource_name   = 'keyword'
+        fields          = ['id', 'label',]

akvo/api/resources/project.py

@@ -26,7 +26,7 @@
 from akvo.api.serializers import IATISerializer
 
 from akvo.rsr.models import (
-    Project, Benchmarkname, Category, Goal, Partnership, BudgetItem, ProjectLocation, Benchmark
+    Project, Benchmarkname, Category, Goal, Partnership, BudgetItem, ProjectLocation, Benchmark, Keyword
 )
 from akvo.utils import RSR_LIMITED_CHANGE
 
@@ -105,6 +105,7 @@ def obj_update(self, bundle, skip_errors=False, **kwargs):
             ProjectLocation.objects.filter(location_target=bundle.obj).delete()
             Partnership.objects.filter(project=bundle.obj).delete()
             Benchmark.objects.filter(project=bundle.obj).delete()
+            Keyword.objects.filter(project=bundle.obj).delete()
             bundle.obj.categories.clear()
 
         self.authorized_update_detail(self.get_object_list(bundle.request), bundle)
@@ -239,6 +240,7 @@ class ProjectResource(ConditionalFullResource):
     budget_items = ConditionalFullToManyField('akvo.api.resources.BudgetItemResource', 'budget_items')
     categories = ConditionalFullToManyField('akvo.api.resources.CategoryResource', 'categories')
     goals = ConditionalFullToManyField('akvo.api.resources.GoalResource', 'goals')
+    keywords = ConditionalFullToManyField('akvo.api.resources.KeywordResource', 'keywords')
     invoices = ConditionalFullToManyField('akvo.api.resources.InvoiceResource', 'invoices')
     links = ConditionalFullToManyField('akvo.api.resources.LinkResource', 'links')
     locations = ConditionalFullToManyField('akvo.api.resources.ProjectLocationResource', 'locations')
@@ -249,7 +251,7 @@ class ProjectResource(ConditionalFullResource):
 
     class Meta:
         allowed_methods         = ['get']
-        authentication          = MultiAuthentication(ApiKeyAuthentication(), Authentication(),)
+        authentication          = ConditionalApiKeyAuthentication(methods_requiring_key=['POST', 'PUT'])
         queryset                = Project.objects.all() #Note: this is modified in get_object_list()
         resource_name           = 'project'
         include_absolute_url    = True

akvo/api/resources/user.py

@@ -5,7 +5,7 @@
 # For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
 
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 
 from tastypie.authentication import ApiKeyAuthentication
 from tastypie.constants import ALL_WITH_RELATIONS, ALL
@@ -23,7 +23,7 @@ class UserResource(ConditionalFullResource):
     class Meta:
         authentication  = ApiKeyAuthentication()
         allowed_methods = ['get']
-        queryset = User.objects.filter(is_active=True)
+        queryset = get_user_model().objects.filter(is_active=True)
         resource_name = 'user'
         fields = ['username', 'first_name', 'last_name', 'last_login',]
         filtering = dict(

akvo/rest/serializers/__init__.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+from .benchmark import BenchmarkSerializer
+from .benchmark_name import BenchmarknameSerializer
+from .budget_item import BudgetItemSerializer
+from .budget_item_label import BudgetItemLabelSerializer
+from .category import CategorySerializer
+from .country import CountrySerializer
+from .focus_area import FocusAreaSerializer
+from .goal import GoalSerializer
+from .internal_organisation_id import InternalOrganisationIDSerializer
+from .invoice import InvoiceSerializer
+from .link import LinkSerializer
+from .organisation import OrganisationSerializer
+from .organisation_location import OrganisationLocationSerializer
+from .partner_site import PartnerSiteSerializer
+from .partner_type import PartnerTypeSerializer
+from .partnership import PartnershipSerializer
+from .project import ProjectSerializer
+from .project_comment import ProjectCommentSerializer
+from .project_location import ProjectLocationSerializer
+from .project_update import ProjectUpdateSerializer
+from .publishing_status import PublishingStatusSerializer
+from .user import UserSerializer
+from .user_profile import UserProfileSerializer
+
+__all__ = [
+    'BenchmarkSerializer',
+    'BenchmarknameSerializer',
+    'BudgetItemSerializer',
+    'BudgetItemLabelSerializer',
+    'CategorySerializer,'
+    'CountrySerializer',
+    'FocusAreaSerializer',
+    'GoalSerializer',
+    'InternalOrganisationIDSerializer',
+    'InvoiceSerializer',
+    'LinkSerializer',
+    'OrganisationSerializer',
+    'OrganisationLocationSerializer',
+    'PartnerSiteSerializer',
+    'PartnerTypeSerializer',
+    'PartnershipSerializer',
+    'ProjectSerializer',
+    'ProjectCommentSerializer',
+    'ProjectLocationSerializer',
+    'ProjectUpdateSerializer',
+    'PublishingStatusSerializer',
+    'UserSerializer,'
+    'UserProfileSerializer',
+]

akvo/rest/serializers/benchmark.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import Benchmark
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class BenchmarkSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = Benchmark
+        fields = (
+        )

akvo/rest/serializers/benchmark_name.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import Benchmarkname
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class BenchmarknameSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = Benchmarkname
+        fields = (
+        )

akvo/rest/serializers/budget_item.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import BudgetItem
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class BudgetItemSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = BudgetItem
+        fields = (
+        )

akvo/rest/serializers/budget_item_label.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import BudgetItemLabel
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class BudgetItemLabelSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = BudgetItemLabel
+        fields = (
+        )

akvo/rest/serializers/category.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import Category
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class CategorySerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = Category
+        fields = (
+        )

akvo/rest/serializers/country.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import Country
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class CountrySerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = Country
+        fields = (
+        )

akvo/rest/serializers/focus_area.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import FocusArea
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class FocusAreaSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = FocusArea
+        fields = (
+        )

akvo/rest/serializers/goal.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import Goal
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class GoalSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = Goal
+        fields = (
+        )

akvo/rest/serializers/internal_organisation_id.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import InternalOrganisationID
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class InternalOrganisationIDSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = InternalOrganisationID
+        fields = (
+        )

akvo/rest/serializers/invoice.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Akvo RSR is covered by the GNU Affero General Public License.
+# See more details in the license.txt file located at the root folder of the Akvo RSR module.
+# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+
+
+from akvo.rsr.models import Invoice
+
+from .rsr_serializer import BaseRSRSerializer
+
+
+class InvoiceSerializer(BaseRSRSerializer):
+
+    class Meta:
+        model = Invoice
+        fields = (
+        )