From 25aa2c07011ef8d680ba27d17a4f5bb49f660a85 Mon Sep 17 00:00:00 2001 From: drusepth Date: Tue, 6 Dec 2022 12:45:52 -0800 Subject: [PATCH 1/3] fix bad perms --- app/controllers/page_collection_submissions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/page_collection_submissions_controller.rb b/app/controllers/page_collection_submissions_controller.rb index 99a17aed..7dab6782 100644 --- a/app/controllers/page_collection_submissions_controller.rb +++ b/app/controllers/page_collection_submissions_controller.rb @@ -2,7 +2,7 @@ class PageCollectionSubmissionsController < ApplicationController before_action :set_page_collection, only: [:index] before_action :set_page_collection_submission, only: [:show, :edit, :update, :destroy, :approve, :pass] - before_action :require_collection_ownership, only: [:index, :edit, :update, :destroy, :pass, :approve] + before_action :require_collection_ownership, only: [:index] # GET /page_collection_submissions def index From 2ab4c34fd794cf9925647b7c2a748bd4e1f51807 Mon Sep 17 00:00:00 2001 From: drusepth Date: Fri, 9 Dec 2022 17:42:33 -0800 Subject: [PATCH 2/3] require auth on comment creation --- app/controllers/share_comments_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/share_comments_controller.rb b/app/controllers/share_comments_controller.rb index 980d7248..9e5cd209 100644 --- a/app/controllers/share_comments_controller.rb +++ b/app/controllers/share_comments_controller.rb @@ -1,4 +1,6 @@ class ShareCommentsController < ApplicationController + before_action :authenticate_user! + before_action :set_share_comment, only: [:update, :destroy] # POST /share_comments From 70fe58b90a7e540cf2ffcebb6295b47ecc9bdd5e Mon Sep 17 00:00:00 2001 From: drusepth Date: Fri, 16 Dec 2022 00:55:01 -0800 Subject: [PATCH 3/3] properly orphan deleted docs when also deleting folders --- app/controllers/folders_controller.rb | 3 ++- app/models/folder.rb | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb index 209fb60e..77d44ee5 100644 --- a/app/controllers/folders_controller.rb +++ b/app/controllers/folders_controller.rb @@ -17,7 +17,8 @@ class FoldersController < ApplicationController def destroy # Relocate all documents in this folder to the root "folder" - Document.where(folder_id: @folder.id).update_all(folder_id: nil) + # TODO - I think we can handle this at the model association level with dependent: nullify, but I've never used it + Document.with_deleted.where(folder_id: @folder.id).update_all(folder_id: nil) # Relocate all child folders in this folder to the root "folder" Folder.where(parent_folder_id: @folder.id).update_all(parent_folder_id: nil) diff --git a/app/models/folder.rb b/app/models/folder.rb index e3508003..2d9d7bb7 100644 --- a/app/models/folder.rb +++ b/app/models/folder.rb @@ -1,4 +1,6 @@ class Folder < ApplicationRecord + has_many :documents + belongs_to :parent_folder, optional: true, class_name: Folder.name, foreign_key: :parent_folder_id belongs_to :user