Add Comments Model, RichTextField,Datetimepicker.js

Api/permissions.py

@@ -0,0 +1,16 @@
+from rest_framework import permissions
+
+
+class IsOwnerOrReadOnly(permissions.BasePermission):
+    """
+    Custom permission to only allow owners of an object to edit it.
+    """
+
+    def has_object_permission(self, request, view, obj):
+        # Read permissions are allowed to any request,
+        # so we'll always allow GET, HEAD or OPTIONS requests.
+        if request.method in permissions.SAFE_METHODS:
+            return True
+
+        # Write permissions are only allowed to the owner of the snippet.
+        return obj.created_by == request.user

Api/views.py

@@ -17,9 +17,10 @@
 from book.models import Member, Category, Publisher, Book
 from rest_framework.views import APIView, status
 from rest_framework.response import Response
-from rest_framework.permissions import IsAuthenticated, AllowAny, IsAdminUser
+from rest_framework.permissions import IsAuthenticated, AllowAny, IsAdminUser,IsAuthenticatedOrReadOnly
 from django.core.exceptions import PermissionDenied
 from book.groups_permissions import check_user_group
+from .permissions import IsOwnerOrReadOnly
 
 @api_view(['GET'])
 @permission_classes((permissions.IsAuthenticated,))
@@ -168,7 +169,7 @@ def PublisherDelete(request, pk):
 # Member API
 
 class MemberList(APIView):
-	permission_classes = [IsAuthenticated]
+	permission_classes = [IsAuthenticatedOrReadOnly]
 
 	def get(self,request,format=None):
 		members = Member.objects.all()
@@ -184,7 +185,7 @@ def post(self,request,format =None):
 
 class MemberDetail(APIView):
 
-	permission_classes = [IsAuthenticated]
+	permission_classes = [IsAuthenticatedOrReadOnly,IsOwnerOrReadOnly]
 
 	def get_object(self,pk):
 		try:
@@ -210,3 +211,6 @@ def delete(self, request, pk, format=None):
 		member.delete()
 		return Response(status=status.HTTP_204_NO_CONTENT)
 
+
+
+# User Api

book/groups_permissions.py

@@ -26,6 +26,19 @@ class SuperUserRequiredMixin(LoginRequiredMixin, UserPassesTestMixin):
     def test_func(self):
         return self.request.user.is_superuser
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 # content_type = ContentType.objects.get_for_model(Book)
 # content_type = ContentType.objects.get_for_model(BlogPost)
 # permission = Permission.objects.create(

book/migrations/0025_auto_20210825_1956.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.2.10 on 2021-08-25 17:56
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('book', '0024_auto_20210816_1131'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='borrowrecord',
+            name='end_day',
+            field=models.DateTimeField(default=datetime.datetime(2021, 9, 1, 17, 56, 34, 718543, tzinfo=utc)),
+        ),
+    ]

book/migrations/0026_auto_20210825_1957.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.2.10 on 2021-08-25 17:57
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('book', '0025_auto_20210825_1956'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='borrowrecord',
+            name='end_day',
+            field=models.DateTimeField(default=datetime.datetime(2021, 9, 1, 17, 57, 38, 36825, tzinfo=utc)),
+        ),
+    ]

book/migrations/0027_auto_20210825_2026.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.2.10 on 2021-08-25 18:26
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('book', '0026_auto_20210825_1957'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='borrowrecord',
+            name='end_day',
+            field=models.DateTimeField(default=datetime.datetime(2021, 9, 1, 18, 26, 3, 755494, tzinfo=utc)),
+        ),
+    ]

book/views.py

@@ -39,6 +39,8 @@
 from django.forms.models import model_to_dict
 from django.core.paginator import Paginator
 from django.contrib.contenttypes.models import ContentType
+from comment.models import Comment
+from comment.forms import CommentForm
 
 
 
@@ -202,6 +204,7 @@ class BookDetailView(LoginRequiredMixin,DetailView):
     context_object_name = 'book'
     template_name = 'book/book_detail.html'
     login_url = 'login'
+    comment_form = CommentForm()
 
     # def get_object(self, queryset=None):
     #     obj = super(BookDetailView, self).get_object(queryset=queryset)
@@ -210,8 +213,11 @@ class BookDetailView(LoginRequiredMixin,DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         current_book_name = self.get_object().title
+        comments = Comment.objects.filter(book=self.get_object().id)
         related_records = BorrowRecord.objects.filter(book=current_book_name)
         context['related_records'] = related_records
+        context['comments'] = comments
+        context['comment_form'] = self.comment_form
         return context
 
 class BookCreateView(LoginRequiredMixin,CreateView):
@@ -428,8 +434,8 @@ def get(self,request,*args,**kwargs):
         return HttpResponseRedirect(reverse("publisher_list"))
 
 
-# User Logs
-@method_decorator(user_passes_test(lambda u: check_user_group(u,"logs")), name='get')
+# User Logs  
+@method_decorator(user_passes_test(lambda u: u.has_perm("book.view_useractivity")), name='dispatch')
 class ActivityListView(LoginRequiredMixin,ListView):
 
     login_url = 'login'
@@ -443,8 +449,10 @@ class ActivityListView(LoginRequiredMixin,ListView):
     all_users = User.objects.values()
     user_list = [x['username'] for x in all_users] 
 
+    # def dispatch(self, *args, **kwargs):
+    #     return super(ActivityListView, self).dispatch(*args, **kwargs)
+
     def get_queryset(self):
-        # check_user_group(self.request.user,'logs')
         data = self.request.GET.copy()
         search =self.request.GET.get("search")
         filter_user=self.request.GET.get("created_by") 
@@ -481,12 +489,13 @@ def get_context_data(self, *args, **kwargs):
         return context
 
 
-@method_decorator(user_passes_test(lambda u: check_user_group(u,"logs")), name='get')
+@method_decorator(user_passes_test(lambda u: u.has_perm("book.delete_useractivity")), name='dispatch')
 class ActivityDeleteView(LoginRequiredMixin,View):
 
     login_url = 'login'
 
     def get(self,request,*args,**kwargs):
+
         log_pk=kwargs["pk"]
         delete_log=UserActivity.objects.get(pk=log_pk)
         messages.error(request, f"Activity Removed")
@@ -804,14 +813,13 @@ def get(self, request, *args, **kwargs):
 
 
 # Data center
-
+@method_decorator(user_passes_test(lambda u: check_user_group(u,"download_data")), name='dispatch')
 class DataCenterView(LoginRequiredMixin,TemplateView):
     template_name = 'book/download_data.html'
     login_url = 'login'
 
 
     def get(self,request,*args, **kwargs):
-        check_user_group(request.user,"download_data")
         data = {m.objects.model._meta.db_table:
         {"source":pd.DataFrame(list(m.objects.all().values())) ,
           "path":f"{str(settings.BASE_DIR)}/datacenter/{m.__name__}_{TODAY}.csv",

comment/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

comment/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CommentConfig(AppConfig):
+    name = 'comment'

comment/forms.py

@@ -0,0 +1,7 @@
+from django import forms
+from .models import Comment
+
+class CommentForm(forms.ModelForm):
+    class Meta:
+        model = Comment
+        fields = ['body']

comment/migrations/0001_initial.py

@@ -0,0 +1,32 @@
+# Generated by Django 2.2.10 on 2021-08-25 17:57
+
+import ckeditor.fields
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('book', '0026_auto_20210825_1957'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Comment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('body', ckeditor.fields.RichTextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='book.Book')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ('created_at',),
+            },
+        ),
+    ]