From f7b73c617a71ef66fd3b5649d55cbe3498ec4abe Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 28 Jan 2019 15:37:24 +0100 Subject: [PATCH] Fix code styling [SCI-2939] --- app/services/team_importer.rb | 2 +- app/services/templates_service.rb | 2 +- db/migrate/20190116101127_add_project_templates.rb | 2 ++ lib/tasks/data.rake | 9 ++++++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/services/team_importer.rb b/app/services/team_importer.rb index 147d3b3e0..02a854e7c 100644 --- a/app/services/team_importer.rb +++ b/app/services/team_importer.rb @@ -156,7 +156,7 @@ class TeamImporter project = Project.find_by_id(project_id) experiment_json = JSON.parse(File.read("#{@import_dir}/experiment.json")) - # Handle situation when experimaent with same name already exists + # Handle situation when experiment with same name already exists exp_name = experiment_json.dig('experiment', 'name') if project.experiments.where(name: exp_name).present? experiment_names = project.experiments.map(&:name) diff --git a/app/services/templates_service.rb b/app/services/templates_service.rb index d3d9dbbd3..04d7ea5f9 100644 --- a/app/services/templates_service.rb +++ b/app/services/templates_service.rb @@ -13,7 +13,7 @@ class TemplatesService end def update_project(project) - return unless project.template == true + return unless project.template owner = project.user_projects .where(role: 'owner') .order(:created_at) diff --git a/db/migrate/20190116101127_add_project_templates.rb b/db/migrate/20190116101127_add_project_templates.rb index ec9e3526b..514eb4170 100644 --- a/db/migrate/20190116101127_add_project_templates.rb +++ b/db/migrate/20190116101127_add_project_templates.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddProjectTemplates < ActiveRecord::Migration[5.1] def change add_column :projects, :template, :boolean diff --git a/lib/tasks/data.rake b/lib/tasks/data.rake index 2f8f7f6e8..c01f9dcfb 100644 --- a/lib/tasks/data.rake +++ b/lib/tasks/data.rake @@ -109,16 +109,19 @@ namespace :data do end desc 'Export experiment to directory' - task :experiment_template_export, [:experiment_id] => [:environment] do |_, args| + task :experiment_template_export, + [:experiment_id] => [:environment] do |_, args| Rails.logger.info( - "Exporting experiment template with ID:#{args[:experiment_id]} to directory in tmp" + "Exporting experiment template with ID:#{args[:experiment_id]} "\ + "to directory in tmp" ) ee = ModelExporters::ExperimentExporter.new(args[:experiment_id]) ee&.export_template_to_dir end desc 'Import experiment from directory to given project' - task :experiment_template_import, %i(dir_path project_id user_id) => [:environment] do |_, args| + task :experiment_template_import, + %i(dir_path project_id user_id) => [:environment] do |_, args| Rails.logger.info( "Importing experiment from directory #{args[:dir_path]}" )