aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert2017-11-20 13:54:35 +0100
committerRobert2017-11-20 13:57:49 +0100
commit0cf679cd9f9b8a624f1b3bbc00e15841ec2b1ee3 (patch)
tree99d35d07d70fa036098b05dd300102b0bf88e4c6
parent07b4077a9e654a59b6b049fb935bc13cd9d8090f (diff)
downloadchouette-core-0cf679cd9f9b8a624f1b3bbc00e15841ec2b1ee3.tar.bz2
Hotfix after incorrect conflict resolution
-rw-r--r--app/controllers/referential_suites_controller.rb4
-rw-r--r--app/helpers/table_builder_helper.rb1
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/referential_suites_controller.rb b/app/controllers/referential_suites_controller.rb
index fe5feed56..6a4fe0ded 100644
--- a/app/controllers/referential_suites_controller.rb
+++ b/app/controllers/referential_suites_controller.rb
@@ -1,4 +1,4 @@
-class ReferentialSuitesController < ApplicationController
+class ReferentialSuitesController < ChouetteController
defaults resource_class: ReferentialSuite
@@ -11,4 +11,4 @@ class ReferentialSuitesController < ApplicationController
build_breadcrumb :index
end
end
-end
+end
diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb
index 5f3bd5919..37f01ce0d 100644
--- a/app/helpers/table_builder_helper.rb
+++ b/app/helpers/table_builder_helper.rb
@@ -120,7 +120,6 @@ module TableBuilderHelper
hcont << content_tag(:th, checkbox(id_name: '0', value: 'all'))
end
- require 'pry'; binding.pry
columns.each do |column|
if overhead.empty?
hcont << content_tag(:th, build_column_header(