aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/compliance_control_sets/show.html.slim2
-rw-r--r--db/schema.rb8
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 89b645dd7..2bd663578 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -77,7 +77,7 @@
.span.fa.fa-cog
ul.dropdown-menu
li
- = link_to t('compliance_control_sets.actions.edit'), edit_compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id) if policy(ComplianceControlBlock).update?
+ = link_to t('compliance_control_sets.actions.edit'), edit_compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id) if policy(ComplianceControlBlock).update? if policy(ComplianceControlBlock).update?
= link_to t('compliance_control_sets.actions.destroy'), compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id), :method => :delete, :data => {:confirm => t('compliance_control_sets.actions.destroy_confirm')} if policy(ComplianceControlBlock).destroy?
.row
.col-lg-12
diff --git a/db/schema.rb b/db/schema.rb
index b6dad4ca7..a992eb32b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -408,9 +408,9 @@ ActiveRecord::Schema.define(version: 20171113101005) 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
@@ -491,7 +491,8 @@ ActiveRecord::Schema.define(version: 20171113101005) do
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
- t.integer "sync_interval", default: 1
+ t.integer "sync_interval", default: 1
+ t.string "objectid_format"
end
create_table "lines", id: :bigserial, force: :cascade do |t|
@@ -635,6 +636,7 @@ ActiveRecord::Schema.define(version: 20171113101005) do
t.integer "created_from_id", limit: 8
t.boolean "ready", default: false
t.integer "referential_suite_id", limit: 8
+ t.string "objectid_format"
end
add_index "referentials", ["created_from_id"], name: "index_referentials_on_created_from_id", using: :btree
@@ -720,6 +722,7 @@ ActiveRecord::Schema.define(version: 20171113101005) do
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
+ t.string "objectid_format"
end
create_table "stop_areas", id: :bigserial, force: :cascade do |t|
@@ -958,6 +961,7 @@ ActiveRecord::Schema.define(version: 20171113101005) do
t.integer "line_referential_id", limit: 8
t.integer "stop_area_referential_id", limit: 8
t.integer "output_id", limit: 8
+ t.string "objectid_format"
end
add_index "workbenches", ["line_referential_id"], name: "index_workbenches_on_line_referential_id", using: :btree