aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume2017-10-04 10:46:26 +0200
committerGuillaume2017-10-04 10:46:43 +0200
commit11dad45ee79f4a662db892fa5cb74010303d838e (patch)
treeace8d34eade5905ae0d7da23133a58b47a0ca7bd
parent35f35bab668e2ae23a490df799ee2cbc7cd651d4 (diff)
downloadchouette-core-11dad45ee79f4a662db892fa5cb74010303d838e.tar.bz2
temporarily decorate @compliance_control_set for table builder links Refs #4663
-rw-r--r--app/views/compliance_control_sets/show.html.slim2
-rw-r--r--db/schema.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 54f95bb34..9a23a679c 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -70,7 +70,7 @@
.row
.col-lg-12
.select_table
- = table_builder_2 block.compliance_controls,
+ = table_builder_2 ModelDecorator.decorate(block.compliance_controls, with: ComplianceControlDecorator),
[ \
TableBuilderHelper::Column.new( \
key: :code, \
diff --git a/db/schema.rb b/db/schema.rb
index 4a1ad3749..7f02a342d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -407,9 +407,9 @@ ActiveRecord::Schema.define(version: 20171003133042) do
t.string "type"
t.integer "parent_id", limit: 8
t.string "parent_type"
+ t.datetime "notified_parent_at"
t.integer "current_step", default: 0
t.integer "total_steps", default: 0
- t.datetime "notified_parent_at"
t.string "creator"
end