git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflit

Browse Source
This commit is contained in:
yamin
2017-08-21 16:35:15 +06:30
parent 8c6f06a667 f26bc83b42
commit b7f9d56221
20 changed files with 312 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/commissioners_controller.rb → app/controllers/origami/commissioners_controller.rb
View File

@@ -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

6
app/controllers/commissions_controller.rb → app/controllers/origami/commissions_controller.rb
View File

@@ -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