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

Merge pull request #3592 from consul/fix_results_links

Browse Source 
Don't show links to disabled budget results
This commit is contained in:
Javier Martín
2019-06-06 13:06:26 +02:00
committed by GitHub
parent a874d25bfa da59315530
commit 10be2ad86c
9 changed files with 88 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/helpers/budgets_helper.rb
View File

@@ -105,4 +105,18 @@ module BudgetsHelper
ends_at: balloting_phase.ends_at }),
method: :post
end
def budget_subnav_items_for(budget)
{
results: t("budgets.results.link"),
stats: t("stats.budgets.link"),
executions: t("budgets.executions.link")
}.select { |section, _| can?(:"read_#{section}", budget) }.map do |section, text|
{
text: text,
url: send("budget_#{section}_path", budget),
active: controller_name == section.to_s
}
end
end
end

35
app/views/budgets/_finished.html.erb Normal file
View File

@@ -0,0 +1,35 @@
<div class="row margin-top">
<div class="small-12 medium-9 column">
<h2><%= t("budgets.index.finished_budgets") %></h2>
<div id="finished_budgets" class="budget-investments-list">
<% budgets.each do |budget| %>
<div class="budget-investment clear">
<div class="panel past-budgets">
<div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-6 column table" data-equalizer-watch>
<div class="table-cell align-middle">
<h3><%= budget.name %></h3>
</div>
</div>
<div class="small-12 medium-6 column table" data-equalizer-watch>
<div id="budget_<%= budget.id %>_results" class="table-cell align-middle">
<% if can?(:read_results, budget) %>
<%= link_to t("budgets.index.see_results"),
budget_results_path(budget),
class: "button" %>
<% end %>
<%= link_to t("budgets.index.milestones"),
budget_executions_path(budget),
class: "button" %>
</div>
</div>
</div>
</div>
</div>
<% end %>
</div>
</div>
</div>

17
app/views/budgets/_subnav.html.erb Normal file
View File

@@ -0,0 +1,17 @@
<div class="row margin-top">
<div class="small-12 column">
<ul class="tabs">
<% budget_subnav_items_for(budget).each do |item| %>
<% if item[:active] %>
<li class="tabs-title is-active">
<span class="show-for-sr"><%= t("shared.you_are_in") %></span>
<%= link_to item[:text], item[:url], class: "is-active" %>
</li>
<% else %>
<li class="tabs-title"><%= link_to item[:text], item[:url] %></li>
<% end %>
<% end %>
</ul>
</div>
</div>

16
app/views/budgets/executions/show.html.erb
View File

@@ -25,21 +25,7 @@
</div>
</div>
<div class="row margin-top">
<div class="small-12 column">
<ul class="tabs">
<li class="tabs-title">
<%= link_to t("budgets.results.link"), budget_results_path(@budget) %>
</li>
<li class="tabs-title">
<%= link_to t("stats.budgets.link"), budget_stats_path(@budget) %>
</li>
<li class="tabs-title is-active">
<%= link_to t("budgets.executions.link"), budget_executions_path(@budget), class: "is-active" %>
</li>
</ul>
</div>
</div>
<%= render "budgets/subnav", budget: @budget %>
<div class="row">
<div class="small-12 medium-3 large-2 column">

35
app/views/budgets/index.html.erb
View File

@@ -53,7 +53,7 @@
<% end %>
<% end %>
<% if current_budget.finished? %>
<% if can?(:read_results, current_budget) %>
<%= link_to t("budgets.show.see_results"),
budget_results_path(current_budget, heading_id: current_budget.headings.first),
class: "button margin-top expanded" %>
@@ -126,38 +126,7 @@
</div>
<% if @finished_budgets.present? %>
<div class="row margin-top">
<div class="small-12 medium-9 column">
<h2><%= t("budgets.index.finished_budgets") %></h2>
<div id="finished_budgets" class="budget-investments-list">
<% @finished_budgets.each do |budget| %>
<div class="budget-investment clear">
<div class="panel past-budgets">
<div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-6 column table" data-equalizer-watch>
<div class="table-cell align-middle">
<h3><%= budget.name %></h3>
</div>
</div>
<div class="small-12 medium-6 column table" data-equalizer-watch>
<div id="budget_<%= budget.id %>_results" class="table-cell align-middle">
<%= link_to t("budgets.index.see_results"),
budget_results_path(budget.id),
class: "button" %>
<%= link_to t("budgets.index.milestones"),
budget_executions_path(budget.id),
class: "button" %>
</div>
</div>
</div>
</div>
</div>
<% end %>
</div>
</div>
</div>
<%= render "finished", budgets: @finished_budgets %>
<% end %>
</div>
<% else %>

17
app/views/budgets/results/show.html.erb
View File

@@ -24,22 +24,7 @@
</div>
</div>
<div class="row margin-top">
<div class="small-12 column">
<ul class="tabs">
<li class="tabs-title is-active">
<span class="show-for-sr"><%= t("shared.you_are_in") %></span>
<%= link_to t("budgets.results.link"), budget_results_path(@budget), class: "is-active" %>
</li>
<li class="tabs-title">
<%= link_to t("stats.budgets.link"), budget_stats_path(@budget) %>
</li>
<li class="tabs-title">
<%= link_to t("budgets.executions.link"), budget_executions_path(@budget) %>
</li>
</ul>
</div>
</div>
<%= render "budgets/subnav", budget: @budget %>
<div class="row">
<div class="small-12 medium-3 large-2 column">

2
app/views/budgets/show.html.erb
View File

@@ -36,7 +36,7 @@
<% end %>
<% end %>
<% if @budget.finished? %>
<% if can?(:read_results, @budget) %>
<%= link_to t("budgets.show.see_results"),
budget_results_path(@budget),
class: "button margin-top expanded" %>

17
app/views/budgets/stats/show.html.erb
View File

@@ -21,22 +21,7 @@
</div>
</div>
<div class="row margin-top">
<div class="small-12 column">
<ul class="tabs">
<li class="tabs-title">
<span class="show-for-sr"><%= t("shared.you_are_in") %></span>
<%= link_to t("budgets.results.link"), budget_results_path(@budget) %>
</li>
<li class="tabs-title is-active">
<%= link_to t("stats.budgets.link"), budget_stats_path(@budget), class: "is-active" %>
</li>
<li class="tabs-title">
<%= link_to t("budgets.executions.link"), budget_executions_path(@budget) %>
</li>
</ul>
</div>
</div>
<%= render "budgets/subnav", budget: @budget %>
<div class="row margin">
<div class="small-12 medium-3 column sidebar">

16
spec/features/budgets/results_spec.rb
View File

@@ -15,6 +15,22 @@ describe "Results" do
Budget::Result.new(budget, heading).calculate_winners
end
scenario "No links to budget results with results disabled" do
budget.update(results_enabled: false)
visit budgets_path
expect(page).not_to have_link "See results"
visit budget_path(budget)
expect(page).not_to have_link "See results"
visit budget_executions_path(budget)
expect(page).not_to have_link "See results"
end
scenario "Diplays winner investments" do
create(:budget_heading, group: group)