consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #991 from consul/destroy-spending-proposals

Browse Source 
Destroy spending proposals
This commit is contained in:
Enrique García
2016-03-14 14:14:52 +01:00
parent 0b1b4384ee c09e6f95d7
commit 89c7459de4
12 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/spending_proposals_controller.rb
View File

@@ -28,6 +28,12 @@ class SpendingProposalsController < ApplicationController
end
end
def destroy
spending_proposal = current_user.spending_proposals.find(params[:id])
spending_proposal.destroy
redirect_to user_path(current_user, filter: 'spending_proposals'), notice: t('flash.actions.destroy.spending_proposal')
end
private
def spending_proposal_params

3
app/models/abilities/common.rb
View File

@@ -25,7 +25,7 @@ module Abilities
can :suggest, Debate
can :suggest, Proposal
can [:flag, :unflag], Comment
cannot [:flag, :unflag], Comment, user_id: user.id
@@ -44,6 +44,7 @@ module Abilities
can :vote, Proposal
can :vote_featured, Proposal
can :create, SpendingProposal
can :destroy, SpendingProposal, author_id: user.id
end
can :create, Annotation

1
app/models/user.rb
View File

@@ -20,6 +20,7 @@ class User < ActiveRecord::Base
has_many :debates, -> { with_hidden }, foreign_key: :author_id
has_many :proposals, -> { with_hidden }, foreign_key: :author_id
has_many :comments, -> { with_hidden }
has_many :spending_proposals, foreign_key: :author_id
has_many :failed_census_calls
has_many :notifications
belongs_to :geozone

12
app/views/users/_spending_proposals.html.erb
View File

@@ -1,10 +1,16 @@
<table class="clear activity-proposals">
<table id="spending_proposals_list" class="clear activity-proposals">
<% @spending_proposals.each do |spending_proposal| %>
<tr id="spending_proposal_<%= spending_proposal.id %>">
<td>
<%= link_to spending_proposal.title, spending_proposal %>
<br>
<%= spending_proposal.description %>
<% if current_user && current_user.id == spending_proposal.author_id %>
<%= link_to t("users.show.delete_spending_proposal"),
spending_proposal,
method: :delete,
data: { confirm: t("users.show.confirm_deletion_spending_proposal") },
class: 'button small warning' %>
<% end %>
</td>
</tr>
<% end %>

2
config/locales/en.yml
View File

@@ -445,6 +445,8 @@ en:
deleted: Deleted
deleted_debate: This debate has been deleted
deleted_proposal: This proposal has been deleted
delete_spending_proposal: Delete
confirm_deletion_spending_proposal: Are you sure? This action can not be undone
filters:
comments:
one: 1 Comment

2
config/locales/es.yml
View File

@@ -445,6 +445,8 @@ es:
deleted: Eliminado
deleted_debate: Este debate ha sido eliminado
deleted_proposal: Este propuesta ha sido eliminada
delete_spending_proposal: Eliminar
confirm_deletion_spending_proposal: "¿Seguro que desea eliminar esta propuesta?"
filters:
comments:
one: 1 Comentario

4
config/locales/responders.en.yml
View File

@@ -13,4 +13,6 @@ en:
notice: "%{resource_name} updated successfully."
debate: "Debate updated successfully."
proposal: "Proposal updated successfully."
spending_proposal: "Investment project updated succesfully."
spending_proposal: "Investment project updated succesfully."
destroy:
spending_proposal: "Spending proposal deleted succesfully."

4
config/locales/responders.es.yml
View File

@@ -13,4 +13,6 @@ es:
notice: "%{resource_name} actualizado correctamente."
debate: "Debate actualizado correctamente."
proposal: "Propuesta actualizada correctamente."
spending_proposal: "Propuesta de inversión actualizada correctamente."
spending_proposal: "Propuesta de inversión actualizada correctamente."
destroy:
spending_proposal: "Propuesta de inversión eliminada."

2
config/routes.rb
View File

@@ -66,7 +66,7 @@ Rails.application.routes.draw do
end
scope '/participatory_budget' do
resources :spending_proposals, only: [:index, :new, :create, :show], path: 'investment_projects'
resources :spending_proposals, only: [:index, :new, :create, :show, :destroy], path: 'investment_projects'
end
resources :stats, only: [:index]

20
spec/features/spending_proposals_spec.rb
View File

@@ -163,4 +163,24 @@ feature 'Spending proposals' do
expect(page).to have_content("You do not have permission to access this page")
end
context "Destroy" do
scenario "User can destroy owned spending proposals" do
user = create(:user, :level_two)
spending_proposal = create(:spending_proposal, author: user)
login_as(user)
visit user_path(user)
within("#spending_proposal_#{spending_proposal.id}") do
click_link "Delete"
end
expect(page).to have_content("Spending proposal deleted succesfully.")
visit user_path(user)
expect(page).not_to have_css("spending_proposal_list")
end
end
end

18
spec/features/users_spec.rb
View File

@@ -203,7 +203,7 @@ feature 'Users' do
background do
@author = create(:user)
create(:spending_proposal, author: @author, title: 'Build a school')
@spending_proposal = create(:spending_proposal, author: @author, title: 'Build a school')
end
scenario 'is not shown if no user logged in' do
@@ -240,6 +240,22 @@ feature 'Users' do
expect(page).to have_content('Build a school')
end
scenario 'delete button is shown if logged in user is author' do
login_as(@author)
visit user_path(@author)
within("#spending_proposal_#{@spending_proposal.id}") do
expect(page).to have_content('Delete')
end
end
scenario 'delete button is not shown if logged in user is admin' do
login_as(create(:administrator).user)
visit user_path(@author)
within("#spending_proposal_#{@spending_proposal.id}") do
expect(page).to_not have_content('Delete')
end
end
end
end

7
spec/models/abilities/common_spec.rb
View File

@@ -30,6 +30,7 @@ describe "Abilities::Common" do
it { should be_able_to(:index, SpendingProposal) }
it { should_not be_able_to(:create, SpendingProposal) }
it { should_not be_able_to(:destroy, SpendingProposal) }
it { should_not be_able_to(:comment_as_administrator, debate) }
it { should_not be_able_to(:comment_as_moderator, debate) }
@@ -83,20 +84,26 @@ describe "Abilities::Common" do
end
describe "when level 2 verified" do
let(:own_spending_proposal) { create(:spending_proposal, author: user) }
before{ user.update(residence_verified_at: Time.now, confirmed_phone: "1") }
it { should be_able_to(:vote, Proposal) }
it { should be_able_to(:vote_featured, Proposal) }
it { should be_able_to(:create, SpendingProposal) }
it { should_not be_able_to(:destroy, create(:spending_proposal)) }
it { should be_able_to(:destroy, own_spending_proposal) }
end
describe "when level 3 verified" do
let(:own_spending_proposal) { create(:spending_proposal, author: user) }
before{ user.update(verified_at: Time.now) }
it { should be_able_to(:vote, Proposal) }
it { should be_able_to(:vote_featured, Proposal) }
it { should be_able_to(:create, SpendingProposal) }
it { should_not be_able_to(:destroy, create(:spending_proposal)) }
it { should be_able_to(:destroy, own_spending_proposal) }
end
end