From 79efb34191fcd2b45ec7e1f38f45d8dd36d9ac1a Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 12 May 2017 11:07:11 +0200 Subject: [PATCH] Fixes error when clonning experiments with long names [SCI-617] --- app/controllers/experiments_controller.rb | 2 ++ app/models/experiment.rb | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 41388f209..513229aee 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -185,6 +185,8 @@ class ExperimentsController < ApplicationController cloned_experiment = @experiment.deep_clone_to_project(current_user, project) success = cloned_experiment.valid? + # Create workflow image + cloned_experiment.delay.generate_workflow_img if success else success = false end diff --git a/app/models/experiment.rb b/app/models/experiment.rb index cabc7d54b..3ad412694 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -1,5 +1,6 @@ class Experiment < ActiveRecord::Base - include ArchivableModel, SearchableModel + include ArchivableModel + include SearchableModel belongs_to :project, inverse_of: :experiments belongs_to :created_by, foreign_key: :created_by_id, class_name: 'User' @@ -354,7 +355,7 @@ class Experiment < ActiveRecord::Base i += 1 while experiment_names.include?(format(format, i, name)) clone = Experiment.new( - name: format(format, i, name), + name: format(format, i, name).truncate(Constants::NAME_MAX_LENGTH), description: description, created_by: current_user, last_modified_by: current_user, @@ -371,10 +372,6 @@ class Experiment < ActiveRecord::Base m.deep_clone_to_experiment(current_user, clone) end clone.save - - # Create workflow image - clone.delay.generate_workflow_img - clone end