Merge branch 'develop' of github.com:tu-software-studio/tinyhands int…

…o develop

accounts/serializers.py

@@ -8,6 +8,12 @@ class Meta:
         model = Account
         exclude = ['password', 'activation_key', 'groups','user_permissions', 'is_staff', 'is_superuser']
 
+    def create(self, validated_data):
+        account = Account.objects.create(**validated_data)
+        account.send_activation_email()
+        return account
+
+
 class DefaultPermissionsSetSerializer(serializers.ModelSerializer):
     is_used_by_accounts = serializers.BooleanField(read_only=True);
 

accounts/static/accounts/js/services/accounts.service.js

@@ -9,6 +9,8 @@ angular.module('AccountsMod')
           method: 'GET'
         },
         all: {
+          url: '/api/account/all/',
+          isArray : true,
           method: 'GET'
         },
         get: {

accounts/templates/accounts/account_activate.html

@@ -1,4 +1,5 @@
 {% extends "accounts/account_base.html" %}
+{% block html %}{% endblock %}
 {% load bootstrap %}
 
 {% block title %}Activate Account{% endblock %}
@@ -8,16 +9,16 @@
 {% block content %}
 <div class="container">
     {% if invalid_key %}
-    <h1>This account has already been activated or your activation key is invalid.  Please contact your administrator.</h1>
+        <h1>This account has already been activated or your activation key is invalid.  Please contact your administrator.</h1>
     {% else %}
-    <h1>Activate Your Account</h1>
-    <p>Your account is almost ready &mdash; just enter a password.</p>
-    <div class="row">
-        <form method="POST" class="col-sm-6">{% csrf_token %}
-            {{ form|bootstrap }}
-            <input type="submit" class="btn btn-primary btn-lg" value="Create" />
-        </form>
-    </div>
+        <h1>Activate Your Account</h1>
+        <p>Your account is almost ready &mdash; just enter a password.</p>
+        <div class="row">
+            <form method="POST" class="col-sm-6">{% csrf_token %}
+                {{ form|bootstrap }}
+                <input type="submit" class="btn btn-primary btn-lg" value="Create" />
+            </form>
+        </div>
     {% endif %}
 </div>
 {% endblock %}

accounts/templates/accounts/account_list.html

@@ -27,7 +27,7 @@ <h1>All Accounts</h1>
       </thead>
 
       <tbody>
-        <tr ng-repeat="account in accountsCtrl.accounts.results" id="{{account.id}}">
+        <tr ng-repeat="account in accountsCtrl.accounts" id="{{account.id}}">
           <td>{{account.email}}</td>
           <td>{{account.first_name}}</td>
           <td>{{account.last_name}}</td>

accounts/views.py

@@ -10,6 +10,7 @@
 from braces.views import LoginRequiredMixin
 from extra_views import ModelFormSetView
 from rest_framework import status
+from rest_framework.decorators import list_route
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -152,6 +153,11 @@ class AccountViewSet(ModelViewSet):
     permission_classes = [IsAuthenticated, HasPermission]
     permissions_required = ['permission_accounts_manage']
 
+    @list_route()
+    def list_all(self, request):
+        accounts = Account.objects.all()
+        serializer = self.get_serializer(accounts, many=True)
+        return Response(serializer.data)
 
 class DefaultPermissionsSetViewSet(ModelViewSet):
     queryset = DefaultPermissionsSet.objects.all()

rest_api/urls.py

@@ -48,6 +48,7 @@
     url(r'^me/$', CurrentUserView.as_view(), name="CurrentUser"),
 
     url(r'^account/$', AccountViewSet.as_view({'get': 'list', 'post':'create'}), name="AccountList"),
+    url(r'^account/all/$', AccountViewSet.as_view({'get': 'list_all'}), name="AccountListAll"),
     url(r'^account/(?P<pk>\d+)/$', AccountViewSet.as_view({'get':'retrieve', 'put':'update', 'delete':'destroy'}), name='Account'),
     url(r'^account/resend-activation-email/(?P<pk>\d+)/$', ResendActivationEmailView.as_view(), name='ResendActivationEmail'),