浏览代码

User account have to be enabled to be able to login. Also adjust the admin page for Time Entries.

Adam Day 4 年之前
父节点
当前提交
6f72d8a05e
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 3 1
      app/admin.py
  2. 1 1
      app/views.py

+ 3 - 1
app/admin.py

@@ -17,7 +17,9 @@ class ProjectAdmin(admin.ModelAdmin):
 
 @admin.register(Entry)
 class EntryAdmin(admin.ModelAdmin):
-    pass
+    list_display = ['user', 'date', 'hours', 'minutes']
+    search_fields = ('user', 'date')
+    ordering = ['user', 'date']
 
 
 @admin.register(EntryNote)

+ 1 - 1
app/views.py

@@ -104,7 +104,7 @@ def home(request):
         if form.is_valid():
             data = form.cleaned_data
             pin = sha256(data['pin'].encode('utf-8')).hexdigest()
-            user = User.objects.filter(pin=pin).first()
+            user = User.objects.filter(pin=pin, status=True).first()
             if user is None:
                 form.add_error('pin', 'Invalid login')
                 login_error = True