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

Merge pull request #1101 from consul/sps-admin-index

Browse Source 
Shows valuator description instead of name on sps admin index
This commit is contained in:
Raimond Garcia
2016-04-27 15:25:19 +02:00
parent 7590deed90 578f9c346b
commit 7f9cf39c41
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/admin.scss
View File

@@ -394,3 +394,10 @@ body.admin {
} }
} }
} }
table.investment-projects-summary {
td.total-price {
white-space: nowrap;
}
}

2
app/views/admin/spending_proposals/index.html.erb
View File

@@ -68,7 +68,7 @@
<% if spending_proposal.valuators.size == 0 %> <% if spending_proposal.valuators.size == 0 %>
<%= t("admin.spending_proposals.index.no_valuators_assigned") %> <%= t("admin.spending_proposals.index.no_valuators_assigned") %>
<% else %> <% else %>
<%= spending_proposal.valuators.collect(&:name).join(', ') %> <%= spending_proposal.valuators.collect(&:description).join(', ') %>
<% end %> <% end %>
</td> </td>
<td class="small"> <td class="small">

10
spec/features/admin/spending_proposals_spec.rb
View File

@@ -30,8 +30,8 @@ feature 'Admin spending proposals' do
spending_proposal2 = create(:spending_proposal) spending_proposal2 = create(:spending_proposal)
spending_proposal3 = create(:spending_proposal) spending_proposal3 = create(:spending_proposal)
valuator1 = create(:valuator, user: create(:user, username: 'Olga')) valuator1 = create(:valuator, user: create(:user, username: 'Olga'), description: 'Valuator Olga')
valuator2 = create(:valuator, user: create(:user, username: 'Miriam')) valuator2 = create(:valuator, user: create(:user, username: 'Miriam'), description: 'Valuator Miriam')
admin = create(:administrator, user: create(:user, username: 'Gema')) admin = create(:administrator, user: create(:user, username: 'Gema'))
spending_proposal1.valuators << valuator1 spending_proposal1.valuators << valuator1
@@ -42,13 +42,13 @@ feature 'Admin spending proposals' do
within("#spending_proposal_#{spending_proposal1.id}") do within("#spending_proposal_#{spending_proposal1.id}") do
expect(page).to have_content("No admin assigned") expect(page).to have_content("No admin assigned")
expect(page).to have_content("Olga") expect(page).to have_content("Valuator Olga")
end end
within("#spending_proposal_#{spending_proposal2.id}") do within("#spending_proposal_#{spending_proposal2.id}") do
expect(page).to have_content("No admin assigned") expect(page).to have_content("No admin assigned")
expect(page).to have_content("Olga") expect(page).to have_content("Valuator Olga")
expect(page).to have_content("Miriam") expect(page).to have_content("Valuator Miriam")
end end
within("#spending_proposal_#{spending_proposal3.id}") do within("#spending_proposal_#{spending_proposal3.id}") do