Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant

2017-06-26 09:59:16 +06:30
parent 560ea343a6 6a6c629da4
commit ecc9ab53ec
65 changed files with 1174 additions and 48 deletions
--- a/app/controllers/crm/bookings_controller.rb
+++ b/app/controllers/crm/bookings_controller.rb
@@ -1,5 +1,5 @@
 class Crm::BookingsController < BaseCrmController
-
+	load_and_authorize_resource
 	def update_booking
        booking = Booking.find(params[:booking_id])
       
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -1,4 +1,5 @@
 class Crm::CustomersController < BaseCrmController
+  load_and_authorize_resource except: [:create]
  before_action :set_crm_customer, only: [:show, :edit, :update, :destroy]

  # GET /crm/customers
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -1,4 +1,5 @@
 class Crm::DiningQueuesController < BaseCrmController
+  load_and_authorize_resource
  before_action :set_dining_queue, only: [:show, :edit, :update, :destroy]

  # GET /crm/dining_queues