Merge branch 'master' into compliance_controls_policycompliance_controls_policy

4 files changed, 4 insertions, 33 deletions

diff --git a/lib/bootstrap_breadcrumbs_builder.rb b/lib/bootstrap_breadcrumbs_builder.rb
deleted file mode 100644
index daa154bdf..000000000
--- a/lib/bootstrap_breadcrumbs_builder.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# bootstrap builder for breadcrumbs_on_rails gem
-class BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Builder
-  def render
-    @context.content_tag(:ul, class: 'breadcrumb') do
-      @elements.collect do |element|
-        render_element(element)
-      end.join.html_safe
-    end
-  end
-
-  def render_element(element)
-    active = element.path.nil? || @context.current_page?(compute_path(element))
-    # Bootstrap use '/' divider by default but you can customize it:
-    # divider = @context.content_tag(:span, '/'.html_safe, class: 'divider') unless active
-
-    @context.content_tag(:li, :class => ('active' if active)) do
-      content = if element.path.nil?
-        compute_name(element)
-      else
-        @context.link_to_unless_current(compute_name(element), compute_path(element), element.options)
-      end
-
-      # content + (divider || '')
-      content
-    end
-  end
-end
-
-
-# Usage:
-# = render_breadcrumbs(builder: BootstrapBreadcrumbsBuilder)
\ No newline at end of file
diff --git a/lib/compliance_control_set_cloner.rb b/lib/compliance_control_set_cloner.rb
index 12e1eccb5..17443a07f 100644
--- a/lib/compliance_control_set_cloner.rb
+++ b/lib/compliance_control_set_cloner.rb
@@ -57,7 +57,7 @@ class ComplianceControlSetCloner
       comment: compliance_control.comment,
       control_attributes: compliance_control.control_attributes,
       criticity: compliance_control.criticity,
-      name: name_of_copy(:compliance_controls, compliance_control.name),
+      name: compliance_control.name,
       origin_code: compliance_control.origin_code,
       type: compliance_control.type
     ).tap do | control |
diff --git a/lib/compliance_control_set_copier.rb b/lib/compliance_control_set_copier.rb
index 20518ee0e..58d40cdbf 100644
--- a/lib/compliance_control_set_copier.rb
+++ b/lib/compliance_control_set_copier.rb
@@ -11,6 +11,8 @@ class ComplianceControlSetCopier
     @referential_id = referential_id
     check_organisation_coherence!
     copy_set
+
+    cck_set
   end
 
 
diff --git a/lib/stif/dashboard.rb b/lib/stif/dashboard.rb
index fafddec62..b6b6b8284 100644
--- a/lib/stif/dashboard.rb
+++ b/lib/stif/dashboard.rb
@@ -5,7 +5,7 @@ module Stif
     end
 
     def referentials
-      @referentials ||= @workbench.all_referentials
+      @referentials ||= self.workbench.all_referentials
     end
 
     def calendars