1 files changed, 40 insertions, 0 deletions
diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb
new file mode 100644
index 000000000..1ce64ed58
--- /dev/null
+++ b/app/controllers/merges_controller.rb
@@ -0,0 +1,40 @@
+class MergesController < ChouetteController
+  # include PolicyChecker
+
+  defaults resource_class: Merge
+  belongs_to :workbench
+
+  respond_to :html
+
+  before_action :set_mergeable_controllers, only: [:new]
+
+  private
+
+  def set_mergeable_controllers
+    @mergeable_referentials ||= parent.referentials.mergeable
+    Rails.logger.debug "Mergeables: #{@mergeable_referentials.inspect}"
+  end
+
+  def build_resource
+    super.tap do |merge|
+      merge.creator = current_user.name
+    end
+  end
+
+  # def build_resource
+  #   @import ||= WorkbenchImport.new(*resource_params) do |import|
+  #     import.workbench = parent
+  #     import.creator   = current_user.name
+  #   end
+  # end
+
+  def merge_params
+    params.require(:merge).permit(
+      referentials: []
+      # :name,
+      # :file,
+      # :type,
+      # :referential_id
+    )
+  end
+end