Fixing a merge conflict with Gemfile.lock file.

martianinteractive · Nov 22, 2011 · 8a35177 · 8a35177
2 parents b61ba1c + d6b7222
commit 8a35177
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,6 @@ config/database.yml
 config/newrelic.yml
 db/*.sqlite3
 public/minified/*
+public/stylesheets/*
 .bundle/environment.rb
 vendor/cache/*
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -96,6 +96,8 @@ GEM
       thor (~> 0.14)
     json (1.6.1)
     libv8 (3.3.10.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)

diff --git a/app/models/scenario.rb b/app/models/scenario.rb
@@ -55,7 +55,7 @@ def clone_for(new_user)
   def clone_variables_for(scenario)
     query = <<-SQL
     INSERT INTO `variables` (`name`, `display_name`, `description`, `unit_si`, `unit_ip`, `si_to_ip`, `left_label`, `right_label`, `subsection`, `zone_position`, `fault_widget_type`, `notes`, `component_code`, `io_type`, `view_type`, `index`, `lock_version`, `node_sequence`, `low_value`, `high_value`, `initial_value`, `is_fault`, `is_percentage`, `disabled`, `fault_is_active`, `type`, `scenario_id`)
-    SELECT `name`, `display_name`, `description`, `unit_si`, `unit_ip`, `si_to_ip`, `left_label`, `right_label`, `subsection`, `zone_position`, `fault_widget_type`, `notes`, `component_code`, `io_type`, `view_type`, `index`, `lock_version`, `node_sequence`, `low_value`, `high_value`, `initial_value`, `is_fault`, `is_percentage`, `disabled`, `fault_is_active`, `type`, #{scenario.id} FROM `variables` WHERE `variables`.`scenario_id` = #{id} AND `variables`.`type` IN ('ScenarioVariable')
+    SELECT `name`, `display_name`, `description`, `unit_si`, `unit_ip`, `si_to_ip`, `left_label`, `right_label`, `subsection`, `zone_position`, `fault_widget_type`, `notes`, `component_code`, `io_type`, `view_type`, `index`, `lock_version`, `node_sequence`, `low_value`, `high_value`, `initial_value`, `is_fault`, `is_percentage`, `disabled`, `fault_is_active`, 'ScenarioVariable', #{scenario.id} FROM `variables` WHERE `variables`.`scenario_id` = #{id} AND `variables`.`type` IN ('ScenarioVariable')
     SQL
     ActiveRecord::Base.connection.execute query
     scenario.variables
@@ -69,9 +69,11 @@ def set_client_version
 
   def copy_variables
     return if is_a_clone?
-    master_scenario.variables.each do |sys_var|
-      variables.create sys_var.attributes.except("id", "created_at", "updated_at", "scenario_id")
-    end
+    query = <<-SQL
+    INSERT INTO `variables` (`name`, `display_name`, `description`, `unit_si`, `unit_ip`, `si_to_ip`, `left_label`, `right_label`, `subsection`, `zone_position`, `fault_widget_type`, `notes`, `component_code`, `io_type`, `view_type`, `index`, `lock_version`, `node_sequence`, `low_value`, `high_value`, `initial_value`, `is_fault`, `is_percentage`, `disabled`, `fault_is_active`, `type`, `scenario_id`)
+    SELECT `name`, `display_name`, `description`, `unit_si`, `unit_ip`, `si_to_ip`, `left_label`, `right_label`, `subsection`, `zone_position`, `fault_widget_type`, `notes`, `component_code`, `io_type`, `view_type`, `index`, `lock_version`, `node_sequence`, `low_value`, `high_value`, `initial_value`, `is_fault`, `is_percentage`, `disabled`, `fault_is_active`, 'ScenarioVariable', #{id} FROM `variables` WHERE `variables`.`scenario_id` = #{master_scenario_id} AND `variables`.`type` IN ('SystemVariable')
+    SQL
+    ActiveRecord::Base.connection.execute query
   end
 
   def longterm_validator