From b945171f2ff3a4cf4d30c40d6a5665f0946146c3 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 19 Dec 2019 15:48:25 +0100 Subject: [PATCH 1/2] Fix creation of new tasks on canvas [SCI-4171] --- app/controllers/canvas_controller.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb index ede012a2e..35582816b 100644 --- a/app/controllers/canvas_controller.rb +++ b/app/controllers/canvas_controller.rb @@ -66,14 +66,8 @@ class CanvasController < ApplicationController float?(pos[1]) && float?(pos[2]) return render_403 end - if index.zero? - center = pos - x = 0 - y = 0 - else - x = pos[1].to_i - center[1].to_i - y = pos[2].to_i - center[2].to_i - end + x = pos[1].to_i + y = pos[2].to_i # Multiple modules cannot have same position return render_403 if positions.any? { |_, v| v[:x] == x && v[:y] == y } positions[pos[0]] = { x: x, y: y } From 7694b2ac6d8648ecef1bb585f9c53bc1a3621dbc Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 19 Dec 2019 15:54:06 +0100 Subject: [PATCH 2/2] Update Dockerfile [SCI-4171] --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e5a0eb630..81dfc8924 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,6 @@ MAINTAINER BioSistemika ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb -RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \ - echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list && \ - wget -q -O /usr/bin/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_linux64.zip && \ - unzip /usr/bin/chromedriver_linux64.zip -d /usr/bin/ - # additional dependecies # libreoffice for file preview generation RUN apt-get update -qq && \ @@ -24,7 +19,7 @@ RUN apt-get update -qq && \ sudo graphviz --no-install-recommends \ libreoffice \ libfile-mimeinfo-perl \ - google-chrome-stable=78.* && \ + chromium-driver && \ wget -q -O /tmp/wkhtmltox_amd64.deb $WKHTMLTOPDF_PACKAGE_URL && \ apt-get install -y /tmp/wkhtmltox_amd64.deb && \ rm /tmp/wkhtmltox_amd64.deb && \