From 54f73ac87be644a3a61afe650cd00524e7205f92 Mon Sep 17 00:00:00 2001
From: Sanasol <mail@sanasol.ws>
Date: Sat, 21 Apr 2018 21:00:19 +0300
Subject: [PATCH] serializer can json date

---
 apps/course/templatetags/jsonify_queryset.py       | 4 ++--
 apps/school/templates/school/livelessons_list.html | 2 +-
 web/src/components/LessonsAdmin.vue                | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/course/templatetags/jsonify_queryset.py b/apps/course/templatetags/jsonify_queryset.py
index 5599b552..414be938 100644
--- a/apps/course/templatetags/jsonify_queryset.py
+++ b/apps/course/templatetags/jsonify_queryset.py
@@ -1,8 +1,8 @@
 from django import template
-import json
+from django.core import serializers
 
 register = template.Library()
 
 @register.filter
 def jsonify(object,fields):
-    return json.dumps(list(object.values(*fields.split(','))))
+    return serializers.serialize('json', object, fields=fields.split(','))
diff --git a/apps/school/templates/school/livelessons_list.html b/apps/school/templates/school/livelessons_list.html
index 1f5bb8e5..445041f4 100644
--- a/apps/school/templates/school/livelessons_list.html
+++ b/apps/school/templates/school/livelessons_list.html
@@ -10,7 +10,7 @@
 <div class="section">
   <div class="section__center center">
 
-    <lessons-admin :lessons="{{livelesson_list | jsonify:"id,title,short_description"}}"></lessons-admin>
+    <lessons-admin :lessons="{{livelesson_list | jsonify:"id,title,short_description,date"}}"></lessons-admin>
 
     <!--<ul>-->
     <!--{% for livelesson in livelesson_list %}-->
diff --git a/web/src/components/LessonsAdmin.vue b/web/src/components/LessonsAdmin.vue
index 091fe531..078efd2f 100644
--- a/web/src/components/LessonsAdmin.vue
+++ b/web/src/components/LessonsAdmin.vue
@@ -4,20 +4,20 @@
             <div class="lessons__list">
                 <div class="lessons__item" v-for="(lesson, index) in lessons">
                     <div class="lessons__actions lessons__actions__no-hover">
-                        <button type="button" class="lessons__action" @click="removeLesson(lesson.id)">
+                        <button type="button" class="lessons__action" @click="removeLesson(lesson.fields.id)">
                             <svg class="icon icon-delete">
                                 <use xlink:href="/static/img/sprite.svg#icon-delete"></use>
                             </svg>
                         </button>
-                        <button type="button" class="lessons__action" @click="editLesson(lesson.id)">
+                        <button type="button" class="lessons__action" @click="editLesson(lesson.fields.id)">
                             <svg class="icon icon-edit">
                                 <use xlink:href="/static/img/sprite.svg#icon-edit"></use>
                             </svg>
                         </button>
                     </div>
-                    <div class="lessons__subtitle subtitle">{{ lesson.title }}</div>
+                    <div class="lessons__subtitle subtitle">{{lesson.fields.date}} // {{ lesson.fields.title }}</div>
                     <div class="lessons__row">
-                        <div class="lessons__content">{{ lesson.short_description }}</div>
+                        <div class="lessons__content">{{ lesson.fields.short_description }}</div>
                     </div>
                 </div>
             </div>