folders_controller.rb in dorsale-3.1.0

- old
+ new

@@ -7,13 +7,13 @@
     :open,
     :close
   ]
 
   def index
-    authorize! :list, model
+    authorize model, :list?
 
-    @folders ||= current_user_scope.folders
+    @folders ||= scope.all
 
     @order ||= sortable_column_order do |column, direction|
       case column
       when "name", "status"
         %(LOWER(dorsale_flyboy_folders.#{column}) #{direction})
@@ -32,40 +32,40 @@
     @folders = @folders.search(params[:q])
     @folders = @folders.page(params[:page])
   end
 
   def show
-    authorize! :read, @folder
+    authorize @folder, :read?
   end
 
   def new
-    @folder ||= current_user_scope.new_folder
+    @folder ||= scope.new
 
-    authorize! :create, @folder
+    authorize @folder, :create?
   end
 
   def create
-    @folder ||= current_user_scope.new_folder(folder_params)
+    @folder ||= scope.new(folder_params_for_create)
 
-    authorize! :create, @folder
+    authorize @folder, :create?
 
     if @folder.save
       flash[:success] = t("messages.folders.create_ok")
       redirect_to @folder
     else
       render :new
     end
   end
 
   def edit
-    authorize! :update, @folder
+    authorize @folder, :update?
   end
 
   def update
-    authorize! :update, @folder
+    authorize @folder, :update?
 
-    if @folder.update_attributes(folder_params)
+    if @folder.update(folder_params_for_update)
       flash[:success] = t("messages.folders.update_ok")
 
       if @folder.closed?
         redirect_to dorsale.flyboy_folders_path
       else
@@ -75,19 +75,19 @@
       render :edit
     end
   end
 
   def destroy
-    authorize! :delete, @folder
+    authorize @folder, :delete?
 
     @folder.destroy
 
     redirect_to url_for(action: :index, id: nil)
   end
 
   def open
-    authorize! :open, @folder
+    authorize @folder, :open?
 
     if @folder.open!
       flash[:success] = t("messages.folders.open_ok")
     else
       flash[:danger] = t("messages.folders.open_error")
@@ -95,11 +95,11 @@
 
     redirect_to @folder
   end
 
   def close
-    authorize! :close, @folder
+    authorize @folder, :close?
 
     if @folder.close!
       flash[:success] = t("messages.folders.close_ok")
     else
       flash[:danger] = t("messages.folders.close_error")
@@ -112,12 +112,16 @@
 
   def model
     ::Dorsale::Flyboy::Folder
   end
 
+  def scope
+    policy_scope(model)
+  end
+
   def set_objects
-    @folder = model.find(params[:id])
+    @folder = scope.find(params[:id])
   end
 
   def permitted_params
     [
       :name,
@@ -125,8 +129,16 @@
     ]
   end
 
   def folder_params
     params.fetch(:folder, {}).permit(permitted_params)
+  end
+
+  def folder_params_for_create
+    folder_params
+  end
+
+  def folder_params_for_update
+    folder_params
   end
 
 end