Merge pull request #3128 from consul/fix_valuation_with_no_budgets

Fix crash in valuation when there are no budgets

app/controllers/valuation/budgets_controller.rb

@@ -7,11 +7,9 @@ class Valuation::BudgetsController < Valuation::BaseController
   def index
     @budget = current_budget
     if @budget.present?
-      @investments_with_valuation_open = {}
+      @investments = @budget.investments
-      @investments_with_valuation_open = @budget.investments
+                            .by_valuator(current_user.valuator)
-                                                .by_valuator(current_user.valuator.try(:id))
                             .valuation_open
-                                                .count
     end
   end
 end

app/views/valuation/budgets/index.html.erb

@@ -1,5 +1,6 @@
 <h2 class="inline-block"><%= t("valuation.budgets.index.title") %></h2>
 
+<% if @budget.present? %>
   <table>
     <thead>
       <tr>
@@ -18,7 +19,7 @@
           <%= t("budgets.phase.#{@budget.phase}") %>
         </td>
         <td>
-        <%= @investments_with_valuation_open %>
+          <%= @investments.count %>
         </td>
         <td>
           <%= link_to t("valuation.budgets.index.evaluate"),
@@ -28,3 +29,8 @@
       </tr>
     </tbody>
   </table>
+<% else %>
+  <div class="callout primary clear">
+    <%= t("valuation.budgets.index.no_budgets") %>
+  </div>
+<% end %>

config/locales/en/valuation.yml

@@ -17,6 +17,7 @@ en:
         table_assigned_investments_valuation_open: Investment projects assigned with valuation open
         table_actions: Actions
         evaluate: Evaluate
+        no_budgets: "There are no budgets"
     budget_investments:
       index:
         headings_filter_all: All headings

config/locales/es/valuation.yml

@@ -17,6 +17,7 @@ es:
         table_assigned_investments_valuation_open: Prop. Inv. asignadas en evaluación
         table_actions: Acciones
         evaluate: Evaluar
+        no_budgets: "No hay presupuestos"
     budget_investments:
       index:
         headings_filter_all: Todas las partidas

spec/features/valuation/budgets_spec.rb

@@ -35,6 +35,11 @@ feature 'Valuation budgets' do
       expect(page).to have_content(budget3.name)
     end
 
+    scenario "With no budgets" do
+      visit valuation_budgets_path
+
+      expect(page).to have_content "There are no budgets"
+    end
   end
 
 end