Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Budget results urls #850

Merged
merged 17 commits into from
Jul 13, 2017
Merged

Budget results urls #850

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6562adf
Adds custom budget heading result's path
voodoorai2000 Jul 12, 2017
f6674d4
marks first heading as selected
voodoorai2000 Jul 12, 2017
e1d7fa8
Use new custom budget heading result path
bertocq Jul 12, 2017
1382b47
Link to custom /resultados without heading unless its on the results …
bertocq Jul 12, 2017
293209d
Correct view results button on budgets finished header
bertocq Jul 12, 2017
c0878e8
Use same header for budget results and stats pages
bertocq Jul 12, 2017
ded7153
Show proposal stats file instead of stats
bertocq Jul 12, 2017
3008c2d
Finished budget welcome page links to results
bertocq Jul 12, 2017
b0b3610
Make current heading blue on results sidebar menu
bertocq Jul 12, 2017
0807c77
Only show welcome budget partials if budget under conditions exist
bertocq Jul 12, 2017
0edfcbf
Reload user before login to avoid flaky budget evaluation test
bertocq Jul 12, 2017
28a0094
Reload user before login to avoid flaky budget evaluation test
bertocq Jul 12, 2017
2c37f1c
Merge branch 'budget-results-urls' of https://github.com/Ayuntamiento…
decabeza Jul 12, 2017
835218b
improves text and button on welcome index
decabeza Jul 12, 2017
c5229ab
changes budget welcome header text
decabeza Jul 12, 2017
d02a3fe
improves results table layout
decabeza Jul 12, 2017
c27dd5d
Remove extra , typo
bertocq Jul 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/views/budgets/results/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<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"), custom_budget_results_path(@budget, heading_id: @budget.headings.first.to_param), class: "is-active" %>
<%= link_to t("budgets.results.link"), custom_budget_results_path(@budget), class: "is-active" %>
</li>
<li class="tabs-title">
<%= link_to t("budgets.stats.link"), custom_budget_stats_path(@budget)%>
Expand All @@ -40,10 +40,10 @@
</li>

<% @budget.headings.order('id ASC').each do |heading| %>
<% active_class = heading.to_param == params[:heading_id] ? 'bold' : '' %>
<% active_class = heading.to_param == @heading.to_param ? 'bold' : '' %>
<li class="<%= active_class %>">
<%= link_to heading.name,
custom_budget_results_path(@budget, heading_id: heading.to_param) %>
custom_budget_heading_result_path(@budget, heading_id: heading.to_param) %>
</li>
<% end %>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/views/budgets/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<% if @budget.finished? %>
<%= link_to t("budgets.show.see_results"),
custom_budget_results_path(@budget, heading_id: @budget.headings.first),
custom_budget_results_path(@budget),
class: "button margin-top expanded" %>
<% end %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/budgets/stats/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<% if @budget.finished? %>
<li class="tabs-title">
<span class="show-for-sr"><%= t("shared.you_are_in") %></span>
<%= link_to t("budgets.results.link"), custom_budget_results_path(@budget, heading_id: @budget.headings.first.to_param) %>
<%= link_to t("budgets.results.link"), custom_budget_results_path(@budget) %>
</li>
<% end %>
<li class="tabs-title is-active">
Expand Down
1 change: 1 addition & 0 deletions config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
get 'presupuestos', to: 'pages#show', id: 'more_info/budgets/welcome', as: 'budgets_welcome'
get "presupuestos/:id/estadisticas", to: "budgets/stats#show", as: 'custom_budget_stats'
get "presupuestos/:id/resultados", to: "budgets/results#show", as: 'custom_budget_results'
get "presupuestos/:id/resultados/:heading_id", to: "budgets/results#show", as: 'custom_budget_heading_result'

resources :budgets, only: [:show, :index], path: 'presupuestos' do
resources :groups, controller: "budgets/groups", only: [:show], path: 'grupo'
Expand Down
2 changes: 1 addition & 1 deletion spec/features/budgets/results_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
visit budget_path(budget)
expect(page).not_to have_link "See results"

visit custom_budget_results_path(budget, heading_id: budget.headings.first)
visit custom_budget_heading_result_path(budget, heading_id: budget.headings.first)
expect(page).to have_content "You do not have permission to carry out the action"
end

Expand Down