From ebfa3fb011b200b89a902160f70bbfbc8c4e7a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 22 Sep 2017 11:39:17 +0200 Subject: [PATCH] Disallow users to edit their legislation proposals --- app/models/abilities/common.rb | 2 +- app/models/abilities/everyone.rb | 2 +- app/views/legislation/proposals/show.html.erb | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 459b779c7..2de8e4c79 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -19,7 +19,7 @@ module Abilities can [:retire_form, :retire], Proposal, author_id: user.id can :read, Legislation::Proposal - can :update, Legislation::Proposal do |proposal| + cannot [:edit, :update], Legislation::Proposal do |proposal| proposal.editable_by?(user) end can [:retire_form, :retire], Legislation::Proposal, author_id: user.id diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index e16a53cec..c97bf0d94 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -18,7 +18,7 @@ module Abilities can [:read, :print], Budget::Investment can :read_results, Budget, phase: "finished" can :new, DirectMessage - can [:read, :debate, :draft_publication, :allegations, :result_publication], Legislation::Process, published: true + can [:read, :debate, :draft_publication, :allegations, :result_publication, :proposals], Legislation::Process, published: true can [:read, :changes, :go_to_version], Legislation::DraftVersion can [:read], Legislation::Question can [:create], Legislation::Answer diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index f3692e3c7..48dae91b6 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -16,18 +16,6 @@
<%= back_link_to %> - <% if can?(:create, @document) && @proposal.documents.size < Proposal.max_documents_allowed %> - <%= link_to t("documents.upload_document"), - new_document_path(documentable_id: @proposal, documentable_type: @proposal.class.name, from: request.url), - class: 'button hollow float-right' %> - <% end %> - - <% if current_user && @proposal.editable_by?(current_user) %> - <%= link_to edit_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal), class: 'edit-proposal button hollow float-right' do %> - <%= t("proposals.show.edit_proposal_link") %> - <% end %> - <% end %> -

<%= @proposal.title %>

<% if @proposal.conflictive? %>