From 09e3bd431512246e3f6aff214516a6461b965d72 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Fri, 21 Sep 2018 20:08:27 +0500
Subject: [PATCH] =?UTF-8?q?LIL-670=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D1=8F=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=BC=20=D1=81=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/views.py                            |  4 ++--
 project/templates/blocks/lil_store_js.html |  7 +++++++
 web/src/components/Comment.vue             | 13 ++++++++++---
 web/src/sass/_common.sass                  |  7 +++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/api/v1/views.py b/api/v1/views.py
index c2bc1f07..04e2beb5 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 
 from rest_framework import status, views, viewsets, generics
-from rest_framework.decorators import detail_route, list_route, action
+from rest_framework.decorators import detail_route, list_route, action, permission_classes
 from rest_framework.response import Response
 
 from . import ExtendedModelViewSet
@@ -451,7 +451,6 @@ class CommentViewSet(ExtendedModelViewSet):
 class ObjectCommentsViewSet(ExtendedModelViewSet):
     queryset = Comment.objects.all()
     serializer_class = CommentCreateSerializer
-    permission_classes = (IsAuthorObjectOrAdmin,)
     ordering_fields = ('update_at', )
 
     def get_queryset(self):
@@ -495,6 +494,7 @@ class ObjectCommentsViewSet(ExtendedModelViewSet):
         except Exception as e:
             print(e)
 
+    @permission_classes((IsAuthorObjectOrAdmin,))
     def perform_destroy(self, instance):
         obj_type = None
         obj_id = None
diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html
index 968ded1a..77e179b8 100644
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@@ -2,6 +2,12 @@
 {% load setting from settings %}
 <script>
   window.LIL_STORE = {
+    roles: {
+        USER_ROLE: 0,
+        AUTHOR_ROLE: 1,
+        TEACHER_ROLE: 2,
+        ADMIN_ROLE: 3,
+    },
     pusherKey: '{% setting "PUSHER_KEY" %}',
     staticUrl: '{% static "" %}',
     accessToken: '{{ request.user.auth_token }}',
@@ -9,6 +15,7 @@
     defaultUserPhoto: "{% static 'img/user_default.jpg' %}",
     user: {
       id: '{{ request.user.id|default:'' }}',
+      role: +'{{ request.user.role }}',
       photo: '{% if request.user.photo %}{{ request.user.photo.url }}{% else %}{% static 'img/user_default.jpg' %}{% endif %}',
     }
   };
diff --git a/web/src/components/Comment.vue b/web/src/components/Comment.vue
index 376d1788..3b5260b1 100644
--- a/web/src/components/Comment.vue
+++ b/web/src/components/Comment.vue
@@ -23,9 +23,16 @@
               <span v-if="! isHeart">{{ comment.content }}</span>
             </div>
           </div>
-          <div class="questions__foot" v-if="! controller.isChat">
-            <button @click="controller.reply(comment)" v-if="$root.store.user.id" class="questions__action question__reply-button">ОТВЕТИТЬ</button>
-            <button @click="controller.remove(comment)" v-if="$root.store.user.id == comment.author.id" class="questions__action question__reply-button">УДАЛИТЬ</button>
+          <div class="questions__foot">
+            <button @click="controller.reply(comment)" v-if="$root.store.user.id && ! controller.isChat" class="questions__action question__reply-button">ОТВЕТИТЬ</button>
+            <button @click="controller.remove(comment)"
+                    v-if="$root.store.user.id == comment.author.id || $root.store.user.role == $root.store.roles.ADMIN_ROLE"
+                    class="questions__action question__reply-button">
+              <span v-if="! controller.isChat">УДАЛИТЬ</span>
+              <span v-if="controller.isChat">
+                <svg class="icon questions__delete-icon"><use xlink:href="/static/img/sprite.svg#icon-delete"></use></svg>
+              </span>
+            </button>
           </div>
         </div>
       </div>
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index a1e6a5bb..e260b2d6 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -2872,6 +2872,7 @@ a.grey-link
       margin-left: 0
   &__details
     margin-bottom: 5px
+    flex: 1
   &__head,
   &__action
     +fb
@@ -2903,6 +2904,12 @@ a.grey-link
     fill: $gray
     width: 20px
     height: 20px
+  &__delete-icon
+    fill: #C8C8C8
+    width: 17px
+    height: 17px
+    :hover
+      fill: #000000
   &--heart
     &__content
       font-size: 24px