fix conflit

app/controllers/origami/commissioners_controller.rb

@@ -1,5 +1,5 @@
-class CommissionersController < ApplicationController
-  before_action :set_commissioner, only: [:show, :edit, :update, :destroy]
+class Origami::CommissionersController < BaseOrigamiController
+  # before_action :set_commissioner, only: [:show, :edit, :update, :destroy]
 
   # GET /commissioners
   # GET /commissioners.json

app/controllers/origami/commissions_controller.rb

@@ -1,5 +1,5 @@
-class CommissionsController < ApplicationController
-  before_action :set_commission, only: [:show, :edit, :update, :destroy]
+class Origami::CommissionsController < BaseOrigamiController
+  # before_action :set_commission, only: [:show, :edit, :update, :destroy]
 
   # GET /commissions
   # GET /commissions.json
@@ -56,7 +56,7 @@ class CommissionsController < ApplicationController
   def destroy
     @commission.destroy
     respond_to do |format|
-      format.html { redirect_to commissions_url, notice: 'Commission was successfully destroyed.' }
+      format.html { redirect_to origami_commissions_path, notice: 'Commission was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/views/origami/commissions/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@commission) do |f| %>
+<%= simple_form_for([:origami,@commission]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">

app/views/origami/commissions/index.html.erb

@@ -13,7 +13,7 @@
     <% @commissions.each do |commission| %>
       <tr>
         <td><%= link_to 'Show', commission %></td>
-        <td><%= link_to 'Edit', edit_commission_path(commission) %></td>
+        <td><%= link_to 'Edit', edit_origami_commission_path(commission) %></td>
         <td><%= link_to 'Destroy', commission, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
@@ -22,4 +22,4 @@
 
 <br>
 
-<%= link_to 'New Commission', new_commission_path %>
+<%= link_to 'New Commission', new_origami_commission_path %>

app/views/origami/commissions/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form', commission: @commission %>
 
-<%= link_to 'Back', commissions_path %>
+<%= link_to 'Back', origami_commissions_path %>