From 8715b5c538f684da0585aa956c7eae951dbde7f0 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 27 Apr 2016 14:09:41 +0200 Subject: [PATCH 1/3] Shows valuator description instead of name on sps admin index --- app/views/admin/spending_proposals/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb index 8a273edfe..c4eec60d8 100644 --- a/app/views/admin/spending_proposals/index.html.erb +++ b/app/views/admin/spending_proposals/index.html.erb @@ -68,7 +68,7 @@ <% if spending_proposal.valuators.size == 0 %> <%= t("admin.spending_proposals.index.no_valuators_assigned") %> <% else %> - <%= spending_proposal.valuators.collect(&:name).join(', ') %> + <%= spending_proposal.valuators.collect(&:description).join(', ') %> <% end %> From 32f4228b5f4515bb67ce90f484fac4a8b304a8b8 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 27 Apr 2016 14:15:05 +0200 Subject: [PATCH 2/3] Fixes total price wrap on summary tables --- app/assets/stylesheets/admin.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index dc7ac5d25..48642841d 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -394,3 +394,10 @@ body.admin { } } } + +table.investment-projects-summary { + + td.total-price { + white-space: nowrap; + } +} From 578f9c346b4066e2a8bae974b2de00f3c161481a Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 27 Apr 2016 15:02:58 +0200 Subject: [PATCH 3/3] Updates specs --- spec/features/admin/spending_proposals_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb index ab749819a..f8cc12133 100644 --- a/spec/features/admin/spending_proposals_spec.rb +++ b/spec/features/admin/spending_proposals_spec.rb @@ -30,8 +30,8 @@ feature 'Admin spending proposals' do spending_proposal2 = create(:spending_proposal) spending_proposal3 = create(:spending_proposal) - valuator1 = create(:valuator, user: create(:user, username: 'Olga')) - valuator2 = create(:valuator, user: create(:user, username: 'Miriam')) + valuator1 = create(:valuator, user: create(:user, username: 'Olga'), description: 'Valuator Olga') + valuator2 = create(:valuator, user: create(:user, username: 'Miriam'), description: 'Valuator Miriam') admin = create(:administrator, user: create(:user, username: 'Gema')) spending_proposal1.valuators << valuator1 @@ -42,13 +42,13 @@ feature 'Admin spending proposals' do within("#spending_proposal_#{spending_proposal1.id}") do expect(page).to have_content("No admin assigned") - expect(page).to have_content("Olga") + expect(page).to have_content("Valuator Olga") end within("#spending_proposal_#{spending_proposal2.id}") do expect(page).to have_content("No admin assigned") - expect(page).to have_content("Olga") - expect(page).to have_content("Miriam") + expect(page).to have_content("Valuator Olga") + expect(page).to have_content("Valuator Miriam") end within("#spending_proposal_#{spending_proposal3.id}") do