Error message fixes for CSV import. Add the necessary directory to Docker image.

This commit is contained in:
Jyri-Petteri Paloposki 2022-02-09 11:28:05 +02:00
parent 194d261042
commit c2bd1b0d81
4 changed files with 26 additions and 3 deletions

View file

@ -17,10 +17,25 @@ RUN apt-get update && apt-get install -y yarn netcat
RUN mkdir /app/log
COPY . /app/
COPY COPYING /app/
COPY config /app/config/
COPY config/database.docker.yml /app/config/database.yml
COPY config/site.docker.yml /app/config/site.yml
COPY bin /app/bin/
COPY script /app/script/
COPY public /app/public/
COPY vendor /app/vendor/
COPY .yardopts /app/
COPY Rakefile /app/
COPY config.ru /app/
COPY docker-entrypoint.sh /app/
COPY lib /app/lib/
COPY app /app/app/
COPY db /app/db/
RUN RAILS_ENV=production bundle exec rake assets:precompile
ENTRYPOINT ["/app/docker-entrypoint.sh"]

View file

@ -62,12 +62,16 @@ class DataController < ApplicationController
flash[:notice] = t 'data.import.projects_count', count: count
when 'todos'
count = Todo.import path_and_file, params, current_user
flash[:notice] = t 'data.import.todos.count', count: count
if not count
flash[:error] = t('data.import.errors.invalid_destination')
else
flash[:notice] = t 'data.import.todos_count', count: count
end
else
flash[:error] = t('data.import.errors.invalid_destination')
end
rescue Exception => e
flash[:error] = t 'data.import.invalid_destination', e: e
flash[:error] = t 'data.import.errors.invalid_destination', e: e
end
File.delete(path_and_file)
redirect_to import_data_path

View file

@ -353,6 +353,10 @@ class Todo < ApplicationRecord
def self.import(filename, params, user)
default_context = user.contexts.order('id').first
if default_context.nil?
logger.error "No available contexts in import"
return FALSE
end
count = 0
CSV.foreach(filename, headers: true) do |row|

0
public/uploads/csv/.keep Normal file
View file