From a9327378819e6461c658efccf91af5236180da08 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 19 Mar 2019 10:55:09 +0100 Subject: [PATCH] Delete ballots --- app/helpers/ballots_helper.rb | 2 +- app/views/admin/stats/show.html.erb | 2 -- app/views/budgets/ballot/lines/new.js.erb | 2 -- spec/features/admin/feature_flags_spec.rb | 1 - spec/features/users_spec.rb | 1 - spec/features/votes_spec.rb | 1 - 6 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 app/views/budgets/ballot/lines/new.js.erb diff --git a/app/helpers/ballots_helper.rb b/app/helpers/ballots_helper.rb index 8bdc5f231..e29010230 100644 --- a/app/helpers/ballots_helper.rb +++ b/app/helpers/ballots_helper.rb @@ -4,4 +4,4 @@ module BallotsHelper (amount_spent / amount_available.to_f * 100).to_s + "%" end -end \ No newline at end of file +end diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb index 650f23fe5..2c806796d 100644 --- a/app/views/admin/stats/show.html.erb +++ b/app/views/admin/stats/show.html.erb @@ -25,7 +25,6 @@ graph_admin_stats_path(id: "visits", count: @visits) %>
<%= number_with_delimiter(@visits) %>

-

<%= t "admin.stats.show.summary.debates" %>
<%= number_with_delimiter(@debates) %> @@ -55,7 +54,6 @@ <%= t "admin.stats.show.summary.proposal_votes" %>
<%= number_with_delimiter(@proposal_votes) %>

-

<%= t "admin.stats.show.summary.debate_votes" %>
<%= number_with_delimiter(@debate_votes) %> diff --git a/app/views/budgets/ballot/lines/new.js.erb b/app/views/budgets/ballot/lines/new.js.erb deleted file mode 100644 index 6c8cecac4..000000000 --- a/app/views/budgets/ballot/lines/new.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -$("#<%= dom_id(@spending_proposal) %>_ballot").html("<%= j render("spending_proposals/ballot", spending_proposal: @spending_proposal) %>"); -$(".no-supports-allowed").show(); \ No newline at end of file diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb index b22e6831b..deedb8d6a 100644 --- a/spec/features/admin/feature_flags_spec.rb +++ b/spec/features/admin/feature_flags_spec.rb @@ -4,7 +4,6 @@ describe "Admin feature flags" do before do Setting["feature.spending_proposals"] = true - Setting["feature.spending_proposal_features.voting_allowed"] = true login_as(create(:administrator).user) end diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index 781b55c68..051363946 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -231,7 +231,6 @@ describe "Users" do end end - end describe "Public interests" do diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index db9091aeb..596f4378b 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -377,7 +377,6 @@ describe "Votes" do after do Setting["feature.spending_proposals"] = nil - Setting["feature.spending_proposal_features.voting_allowed"] = nil end describe "Index" do