Merge pull request #166 from Brett78/master

Added rfid card listing and removed user drop down from rfid create form

mhackspace/templates/users/rfid_form.html

@@ -4,8 +4,9 @@
 {% block title %}{{ user.username }}{% endblock %}
 
 {% block content %}
+ {% if form %}
   <h1>{{ user.username }}</h1>
-  <form class="form-horizontal" method="post" action="{% url 'users:update' %}" enctype="multipart/form-data">
+  <form class="form-horizontal" method="post" action="{% url 'users:access_card_create' %}" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form|crispy }}
     {{ form_blurb|crispy }}
@@ -15,4 +16,26 @@
       </div>
     </div>
   </form>
+  {% else %}
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>Code</th>
+          <th>Short Description</th>
+        </tr>
+      </thead>
+      {% for rfid in rfids %}
+      <tr>
+        <th scope="row"> {{ forloop.counter }} </th>
+        <td>
+          {{ rfid.code}}
+        </td>
+        <td>
+          {{ rfid.description}}
+        </td>
+      </tr>
+      {% endfor %}
+    </table>
+  {% endif %}
 {% endblock %}

mhackspace/users/urls.py

@@ -28,7 +28,12 @@ urlpatterns = [
     ),
     url(
         regex=r'^-access-cards$',
-        view=views.RfidCardsUpdateView.as_view(),
+        view=views.RfidCardsListView.as_view(),
         name='access_cards'
     ),
+    url(
+        regex=r'^-access-card-create$',
+        view=views.RfidCardsUpdateView.as_view(),
+        name='access_card_create'
+    ),
 ]

mhackspace/users/views.py

@@ -67,17 +67,27 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         return super(UserUpdateView, self).form_valid(form)
 
 
-class RfidCardsUpdateView(LoginRequiredMixin, CreateView):
+class RfidCardsListView(LoginRequiredMixin, ListView):
-    fields = ['user', 'code', 'description', ]
+    template_name = 'users/rfid_form.html'
+    context_object_name = 'rfids'
+    paginate_by = 50
     model = Rfid
 
+    def get_queryset(self):
+        return Rfid.objects.filter(user=self.request.user)
+
+
+class RfidCardsUpdateView(LoginRequiredMixin, CreateView):
+    fields = ['code', 'description', ]
+    model = Rfid
+    success_url = '/users/-access-cards'
+
     def form_valid(self, form):
         user = self.request.user
         form.instance.user = user
         return super(RfidCardsUpdateView, self).form_valid(form)
 
 
-
 class UserListView(LoginRequiredMixin, ListView):
     model = User
     # These next two lines tell the view to index lookups by username