Commit Graph

2271 Commits

Author SHA1 Message Date
Anna Anks Nowak
0affaaee7e Refactor sorting specs to work with direction 2019-01-10 16:11:46 +01:00
Javier Martín
90a66239a5 Merge pull request #3151 from consul/backport-fix_admin_investments_default_order
Add default order for admin budget investments list
2019-01-09 15:46:52 +01:00
Javi Martín
7c06320f39 Fix typo 2019-01-09 12:55:27 +01:00
Javi Martín
be864ee92f Make sure selected investment is visibile in spec
After changing the order for budget investments, the selected investment
didn't appear on the first page anymore, and so it couldn't be clicked
on during the test.
2019-01-09 12:55:22 +01:00
Alberto
bbcb96027b Merge pull request #3137 from consul/key-dates-processes
[Backport] Processes key dates
2019-01-08 10:51:40 +01:00
María Checa
650fe2553e Add default order for admin budget investments list
When there's no sorting option selected, by default it orders the investment list by supports and, for those with the same number of supports, by ID.
2019-01-02 12:52:28 +01:00
decabeza
dd8e2d6311 Shows participation phases only if there is a phase enabled 2018-12-28 18:23:08 +01:00
decabeza
a8fb479be5 Adds specs for show view has document present on all phases 2018-12-28 17:22:08 +01:00
Javier Martín
d7e41fb556 Merge pull request #3127 from consul/fix_date_order_translations
Bring back date order translations
2018-12-26 16:40:03 +01:00
Alberto
63f7c18399 Merge pull request #3123 from consul/admin-questions
[Backport] Admin poll questions index
2018-12-26 11:32:28 +01:00
Javi Martín
e34a827c48 Add translations for rails date order
Not doing so caused crashes on applications which don't fall back to
English when a translation is missing.

We're adding them in a separate file so we can exclude it from crowdin
and so translators don't translate symbols as if they were words which
need translation.
2018-12-21 19:31:15 +01:00
Javier Martín
e5cdda9d04 Merge pull request #3128 from consul/fix_valuation_with_no_budgets
Fix crash in valuation when there are no budgets
2018-12-21 19:21:51 +01:00
Javi Martín
fd681c17df Fix crash in valuation when there are no budgets 2018-12-21 17:24:34 +01:00
decabeza
cf7155613e Changes honeypot family name to address on users sign up form 2018-12-21 11:34:12 +01:00
decabeza
9c827d6ce0 Adds poll name on admin poll questions index 2018-12-19 21:00:09 +01:00
Alberto
d4013ee664 Merge pull request #3122 from consul/proposal-create-question
[Backport] Proposal create question
2018-12-19 19:55:24 +01:00
Julian Nicolas Herrero
a421df31db Merge pull request #3115 from consul/backport-1758-flaky_spec_currency_symbol
[Backport] Fix flaky spec checking price without currency symbol
2018-12-19 17:27:54 +01:00
decabeza
aebd29f7e2 Adds create question button to admin proposals show 2018-12-19 16:08:57 +01:00
decabeza
7316c16edd Adds price explanation link on budget investments show 2018-12-19 13:52:17 +01:00
Raimond Garcia
d583c93ebf Merge pull request #3118 from consul/rubocop-not-to
Apply Rubocop not_to rule
2018-12-19 12:47:37 +01:00
Raimond Garcia
ea435ac56c Merge pull request #3112 from consul/rubocop_not_to
Add not_to Rubocop rule
2018-12-19 11:29:44 +01:00
voodoorai2000
b8cc7c5389 Apply rubocop not_to rule 2018-12-19 11:23:53 +01:00
Raimond Garcia
a8de5306c8 Merge pull request #3091 from dpgigorro/2791-homepage-for-legislation-process
add homepage for legislation processes
2018-12-19 11:14:24 +01:00
Julian Herrero
7a690acf6c fix flaky spec
bin/rspec --seed 53044

Failures:

  1) Budget Investments Balloting Phase Confirm
     Failure/Error: expect(page).not_to have_content "#{sp3.price}"
       expected not to find text "100" in "Global Group - Global Heading You still have €999,989 to invest. Amount spent €11 Budget Investment 1006 title €10 Budget Investment 1005 title €1"
     # ./spec/features/budgets/investments_spec.rb:1466:in `block (4 levels) in <top (required)>'
     # ./spec/features/budgets/investments_spec.rb:1458:in `block (3 levels) in <top (required)>'
     # -e:1:in `<main>'

Failed examples:

rspec ./spec/features/budgets/investments_spec.rb:1419 # Budget Investments Balloting Phase Confirm
2018-12-18 17:56:32 +01:00
Javier Martín
4782ca37d6 Merge pull request #3111 from consul/backport-customize_toda_la_ciudad
Remove custom "toda la ciudad" code
2018-12-18 13:03:51 +01:00
Julian Nicolas Herrero
2175339609 Merge pull request #3106 from consul/2918-crud_budget_groups_headings
Change CRUD for budget groups and headings
2018-12-18 10:23:24 +01:00
dperez
bef404c443 add homepage for legislation processes 2018-12-15 18:04:24 +01:00
voodoorai2000
7917cea676 Change to_not for not_to
Eventhough some of us sentimentals still like the syntax `to_not` the current trend is to move to the new syntax `not_to`.

In this commit we are updating the references of expectations that used `to_not` to `not_to`.
2018-12-15 12:33:28 +01:00
Javi Martín
91d91f2ebf Remove city heading specific code
This code accidentally made it to consul, and it's specific to Madrid.
2018-12-14 18:15:51 +01:00
Julian Herrero
6439be44f1 change CRUD for budget groups and headings
To make it more consistent with the rest of the Admin panel,
the CRUD for budget groups and headings has been changed
from the old "all-in-one" form to a separate form for each resource.
2018-12-14 16:34:54 +01:00
Julian Herrero
25e1afea48 fix map rendering for budget headings 2018-12-14 15:37:22 +01:00
Alberto
b701a86c1b Merge pull request #3105 from consul/draft-processes
[Backport] Draft phase on legislation processes
2018-12-13 15:53:11 +01:00
decabeza
df221b43a0 Fixes hound warnings on legislation processes 2018-12-12 18:23:11 +01:00
Javi Martín
449f810255 Edit only existing languages in milestones summary
Adding languages using this form would result in validation errors since
there's no way to fill in the title for the new translation.
2018-12-12 15:15:01 +01:00
Javier Martín
8bcf713d10 Merge pull request #3100 from consul/backport-2743-add_milestones_to_legislation_processes
Add milestones to legislation processes
2018-12-12 15:12:36 +01:00
Javi Martín
a42f5fab37 Add milestones summary to legislation processes 2018-12-11 20:19:48 +01:00
Javi Martín
b95ca9df8a Add milestones to legislation process view 2018-12-11 20:18:53 +01:00
Javi Martín
03dc43a500 Manage legislation process milestones 2018-12-11 20:18:53 +01:00
Javi Martín
2fcbee6261 Manage proposal milestones 2018-12-11 20:09:47 +01:00
Javi Martín
8c45be7887 Show proposal info in admin 2018-12-11 20:09:30 +01:00
Javi Martín
d3f11c3b55 Add search form to proposals admin index 2018-12-11 20:09:30 +01:00
Javi Martín
4770217373 Add proposals index in admin 2018-12-11 20:09:30 +01:00
Javier Martín
81e0931988 Merge pull request #3095 from consul/backport-share_milestoneable_code
Make milestones code reusable
2018-12-11 20:08:07 +01:00
Javier Martín
db53be75d2 Merge pull request #3096 from consul/backport-1630-fix_flaky_localization_specs
Fix flaky localization specs
2018-12-11 19:56:37 +01:00
Javi Martín
df29b49d05 Make milestones view reusable 2018-12-11 19:22:55 +01:00
Javi Martín
3e83b5893c Make milestone specs reusable 2018-12-11 19:22:55 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page
Add map to sidebar on Heading's page
2018-12-11 16:32:35 +01:00
Alberto
05abcbe944 Merge pull request #3081 from consul/featured-proposals
[Backport] Featured proposals
2018-12-10 22:17:51 +01:00
Javi Martín
34e83292a9 Reload I18n after stubbing available locales
Not doing so might cause the following test to use translations for
only one locale. This scenario happens if the previous test executes
I18n.reload!, which resets I18n.config.backend's "@translations"
instance variable.

So, the sequence could be as follows:

1. The previous tests sets `@translations = nil`
2. This test stubs `available_locales` to `[:en]`
3. `@translations` gets only translations for `en`
4. The following test doesn't find translations for Spanish and fails
2018-12-10 20:37:30 +01:00