diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index 73e90eb68..001d23446 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -1,24 +1,8 @@ class DocumentsController < ApplicationController before_action :authenticate_user! - before_action :find_documentable, except: :destroy - before_action :prepare_new_document, only: [:new] - before_action :prepare_document_for_creation, only: :create load_and_authorize_resource - def new - end - - def create - if @document.save - flash[:notice] = t "documents.actions.create.notice" - redirect_to params[:from] - else - flash[:alert] = t "documents.actions.create.alert" - render :new - end - end - def destroy respond_to do |format| format.html do @@ -39,25 +23,4 @@ class DocumentsController < ApplicationController end end - private - - def document_params - params.require(:document).permit(:title, :documentable_type, :documentable_id, - :attachment, :cached_attachment, :user_id) - end - - def find_documentable - @documentable = params[:documentable_type].constantize.find_or_initialize_by(id: params[:documentable_id]) - end - - def prepare_new_document - @document = Document.new(documentable: @documentable, user_id: current_user.id) - end - - def prepare_document_for_creation - @document = Document.new(document_params) - @document.documentable = @documentable - @document.user = current_user - end - end diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb index b95ea80c6..8d9f85578 100644 --- a/app/helpers/documentables_helper.rb +++ b/app/helpers/documentables_helper.rb @@ -1,9 +1,5 @@ module DocumentablesHelper - def can_create_document?(documentable) - can?(:create, Document.new(documentable: documentable)) && documentable.documents.size < documentable.class.max_documents_allowed - end - def documentable_class(documentable) documentable.class.name.parameterize('_') end diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 64b4c5476..e4e92abaf 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -37,7 +37,7 @@ module Abilities can [:create, :destroy], Follow - can [:create, :destroy, :new], Document, documentable: { author_id: user.id } + can [:destroy], Document, documentable: { author_id: user.id } can [:destroy], Image, imageable: { author_id: user.id } diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index fbd1ad364..e257de0bb 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -4,12 +4,6 @@
- <%= document_attachment_file_name(@document) %> -
-