From 9cf5c9eb71643fc1bd2278129bd2beab0b98f833 Mon Sep 17 00:00:00 2001 From: gzbender Date: Fri, 17 Aug 2018 19:08:50 +0500 Subject: [PATCH] =?UTF-8?q?LIL-619=20=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BF=D1=80=D0=B5=D0=B2=D1=8C=D1=8E,=20=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=BE=D1=80=D0=B8=D0=B3=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D0=BA=20=D1=83=D1=80=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/course/models.py | 3 --- apps/course/templates/course/course_only_lessons.html | 2 +- apps/course/templates/course/lesson.html | 2 +- web/src/components/blocks/Image.vue | 8 ++++---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/course/models.py b/apps/course/models.py index 39eed28e..dac438db 100644 --- a/apps/course/models.py +++ b/apps/course/models.py @@ -4,7 +4,6 @@ from uuid import uuid4 from django.db import models from django.core.exceptions import ValidationError from django.utils import timezone -from django.utils.text import slugify from django.utils.timezone import now from django.contrib.auth import get_user_model from django.urls import reverse_lazy @@ -13,8 +12,6 @@ from polymorphic_tree.models import PolymorphicMPTTModel, PolymorphicTreeForeign from project.mixins import BaseModel, DeactivatedMixin -from .manager import CategoryQuerySet - from apps.content.models import ImageObject, Gallery, Video, ContestWork User = get_user_model() diff --git a/apps/course/templates/course/course_only_lessons.html b/apps/course/templates/course/course_only_lessons.html index b987475c..22ae46f3 100644 --- a/apps/course/templates/course/course_only_lessons.html +++ b/apps/course/templates/course/course_only_lessons.html @@ -184,7 +184,7 @@
+ src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html index 94d6b89b..9cc570c1 100644 --- a/apps/course/templates/course/lesson.html +++ b/apps/course/templates/course/lesson.html @@ -31,7 +31,7 @@
+ src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
diff --git a/web/src/components/blocks/Image.vue b/web/src/components/blocks/Image.vue index 013c63f1..527df9f1 100644 --- a/web/src/components/blocks/Image.vue +++ b/web/src/components/blocks/Image.vue @@ -14,7 +14,7 @@ export default { name: "lil-image", - props: ["imageId", "imageUrl", "accessToken"], + props: ["imageId", "imageUrl", "accessToken", "longSide"], data() { return { loading: false, @@ -23,7 +23,7 @@ methods: { onImageAdded(event) { this.loading = true; - const maxSize = 1600; + const longSide = +this.longSide || 1600; let file = event.target.files[0]; const reader = new FileReader(); reader.onload = () => { @@ -32,12 +32,12 @@ let w = 0; let h = 0; if(img.width > img.height) { - w = maxSize; + w = longSide; h = 0; } else { w = 0; - h = maxSize; + h = longSide; } downscale(img.src, w, h).then((dataURL) => { img = null;