mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-01-28 10:37:52 +08:00
Merge pull request #2274 from okriuchykhin/ok_SCI_4171
Fix creation of new tasks on canvas [SCI-4171]
This commit is contained in:
commit
3e37d286c9
2 changed files with 3 additions and 14 deletions
|
@ -3,11 +3,6 @@ MAINTAINER BioSistemika <info@biosistemika.com>
|
|||
|
||||
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 && \
|
||||
|
|
|
@ -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 }
|
||||
|
|
Loading…
Reference in a new issue