From e53de93bee483acaccb756dacd871c15b703f739 Mon Sep 17 00:00:00 2001 From: kikito Date: Mon, 4 Apr 2016 18:16:27 +0200 Subject: [PATCH 1/5] removes the prefix from spending_proposal_code --- app/models/spending_proposal.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index 8532a7f8a..f11dc71c3 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -102,7 +102,7 @@ class SpendingProposal < ActiveRecord::Base end def code - "#{Setting["proposal_code_prefix"]}-#{created_at.strftime('%Y')}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") + "#{created_at.strftime('%Y')}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") end def send_unfeasible_email From 871fc6e3beb30af8119bd27db6c3c279ebcf79df Mon Sep 17 00:00:00 2001 From: kikito Date: Mon, 4 Apr 2016 18:16:54 +0200 Subject: [PATCH 2/5] shows the sp ids in index/show --- app/views/spending_proposals/_spending_proposal.html.erb | 3 +++ app/views/spending_proposals/show.html.erb | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb index 7dff660fc..54ab4f41f 100644 --- a/app/views/spending_proposals/_spending_proposal.html.erb +++ b/app/views/spending_proposals/_spending_proposal.html.erb @@ -40,6 +40,9 @@  •  <%= geozone_name(spending_proposal) %> + +  •  + <%= spending_proposal.id %>

<%= link_to spending_proposal.description, spending_proposal_path(spending_proposal) %>

diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index 9caaa881a..99010a3dc 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -13,6 +13,8 @@ <%= l @spending_proposal.created_at.to_date %>  •  <%= geozone_name(@spending_proposal) %> +  •  + <%= @spending_proposal.id %>
<%= safe_html_with_links @spending_proposal.description.html_safe %> @@ -47,4 +49,4 @@ - \ No newline at end of file + From ca99b2b52911eb1aea424dc25d60e11d157243b9 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 4 Apr 2016 18:35:28 +0200 Subject: [PATCH 3/5] Removes code on index, changes styles on show --- app/views/spending_proposals/_spending_proposal.html.erb | 3 --- app/views/spending_proposals/show.html.erb | 8 ++++++-- config/locales/en.yml | 1 + config/locales/es.yml | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb index 54ab4f41f..7dff660fc 100644 --- a/app/views/spending_proposals/_spending_proposal.html.erb +++ b/app/views/spending_proposals/_spending_proposal.html.erb @@ -40,9 +40,6 @@  •  <%= geozone_name(spending_proposal) %> - -  •  - <%= spending_proposal.id %>

<%= link_to spending_proposal.description, spending_proposal_path(spending_proposal) %>

diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index 99010a3dc..6d642a421 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -13,10 +13,14 @@ <%= l @spending_proposal.created_at.to_date %>  •  <%= geozone_name(@spending_proposal) %> -  •  - <%= @spending_proposal.id %>
+
+

+ <%= t("spending_proposals.show.code") %> + <%= @spending_proposal.id %> +

+ <%= safe_html_with_links @spending_proposal.description.html_safe %> <% if @spending_proposal.external_url.present? %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 9ddd5137e..fa6a20cb1 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -438,6 +438,7 @@ en: back_link: Back show: author_deleted: User deleted + code: 'Investment project code:' share: Share wrong_price_format: Only integer numbers spending_proposal: diff --git a/config/locales/es.yml b/config/locales/es.yml index b826dfb19..e4fc6f281 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -438,6 +438,7 @@ es: back_link: Volver show: author_deleted: Usuario eliminado + code: 'Código propuesta de gasto:' share: Compartir wrong_price_format: Solo puede incluir caracteres numéricos spending_proposal: From 4c523906085d5ac4c7a7781fdc44fd497600ec69 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 4 Apr 2016 18:49:29 +0200 Subject: [PATCH 4/5] removes unused spec --- spec/features/spending_proposals_spec.rb | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb index 62dfee01e..718d8bbbe 100644 --- a/spec/features/spending_proposals_spec.rb +++ b/spec/features/spending_proposals_spec.rb @@ -166,25 +166,7 @@ feature 'Spending proposals' do expect(page).to have_content error_message end - scenario "Show (as admin)" do - user = create(:user) - admin = create(:administrator, user: user) - login_as(admin.user) - - spending_proposal = create(:spending_proposal, - geozone: create(:geozone), - association_name: 'People of the neighbourhood') - - visit spending_proposal_path(spending_proposal) - - expect(page).to have_content(spending_proposal.title) - expect(page).to have_content(spending_proposal.description) - expect(page).to have_content(spending_proposal.author.name) - expect(page).to have_content(spending_proposal.association_name) - expect(page).to have_content(spending_proposal.geozone.name) - end - - scenario "Show (as user)" do + scenario "Show" do user = create(:user) login_as(user) From 53502039dc7ce7016751b5dfb423db1de731e7c2 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 4 Apr 2016 18:49:46 +0200 Subject: [PATCH 5/5] adds specs for spending proposal code --- app/views/spending_proposals/show.html.erb | 2 +- spec/features/spending_proposals_spec.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index 6d642a421..497943820 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -16,7 +16,7 @@
-

+

<%= t("spending_proposals.show.code") %> <%= @spending_proposal.id %>

diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb index 718d8bbbe..cb3a6d8d5 100644 --- a/spec/features/spending_proposals_spec.rb +++ b/spec/features/spending_proposals_spec.rb @@ -181,6 +181,9 @@ feature 'Spending proposals' do expect(page).to have_content(spending_proposal.author.name) expect(page).to have_content(spending_proposal.association_name) expect(page).to have_content(spending_proposal.geozone.name) + within("#spending_proposal_code") do + expect(page).to have_content(spending_proposal.id) + end end context "Destroy" do