consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,135 Commits 1 Branch 0 Tags
2175339609c1924ca97ca601d1fed78122710afa
Commit Graph

3277 Commits

Author SHA1 Message Date
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
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
Julian Nicolas Herrero
1be64a5dc3 Merge pull request #3098 from consul/backport-1742-new_most_active_algorithm 
[Backport] New algorithm for filter 'most active'
 2018-12-13 12:46:18 +01:00
Javier Martín
e1620dfe8d Merge pull request #3103 from consul/backport-update_legislation_milestone_form 
Edit only existing languages in milestones summary
 2018-12-13 12:09:10 +01:00
Javier Martín
0e252b618f Merge pull request #3102 from consul/backport-milestone_status_texts 
Update milestone status texts
 2018-12-13 12:07:47 +01:00
Javier Martín
33ea9219ae Merge pull request #3101 from consul/backport-fix_milestone_validation 
Fix milestone validation
 2018-12-13 12:05:31 +01:00
Julian Herrero
ef835bef1c new algorithm for filter 'most active' 2018-12-13 11:42:22 +01:00
decabeza
534ef9c492 Hides process on index if draft dates match with date current 2018-12-12 18:23:17 +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
Julian Herrero
01033e5371 change coordinates to make the map to be centered in Madrid 2018-12-12 11:00:16 +01:00
Javi Martín
041e1f3f7b Remove obsolete reference to investment milestones 2018-12-11 20:27:54 +01:00
Javi Martín
dca95d608f Display description validation error in milestones 
We had a validation rule for milestones which made sure either the
status or the description was present. However, since the description is
now translatable, the validation error wasn't being displayed in the
admin form.

Moving the validation rule to the translation object fixes the problem.
However, the translation object needs to check an attribute in the
milestone object in order to know whether the description is required or
not. This is tricky because by default it loads the milestone object
from the database, meaning it doesn't work with new records and it
ignores params sent by the browser.

The solution is to manually assign the globalized model before
validating the object. It's a hack, but apparently Rails doesn't provide
a better way to handle this case [1].

[1] https://github.com/rails/rails/issues/32024
 2018-12-11 20:25:38 +01:00
Javi Martín
6974b7d03a Remove redundant specs 
The same cases are tested in the previous `describe` block.
 2018-12-11 20:25:38 +01:00
Javi Martín
281155dde5 Remove duplicate spec 2018-12-11 20:25:37 +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
Javier Martín
bd363466a8 Merge pull request #3089 from consul/backport-polls-show 
Polls voted by
 2018-12-10 20:19:26 +01:00
Javier Martín
64e8dbf67b Merge pull request #3094 from consul/fix_trailing_whitespace 
Remove trailing whitespace
 2018-12-10 20:15:24 +01:00
Javier Martín
364321bf33 Merge pull request #3090 from consul/backport-time_related_specs 
[Backport] Add frozen time condition to proposals phase spec
 2018-12-10 13:47:38 +01:00
Javi Martín
aa45c39d3e Remove trailing whitespace 2018-12-10 12:59:03 +01:00
Javier Martín
ef16efe5e4 Merge pull request #2899 from papayalabs/2980-hide-featured-section-with-no-cards 
Hide Featured section on Home Page if there are no cards
 2018-12-10 12:55:32 +01:00
Javi Martín
a769c61c02 Add frozen time condition to proposals phase spec 
Backport the part of AyuntamientoMadrid@ea6fcb5 which hadn't been
backported yet.
 2018-12-07 15:09:07 +01:00
Javier Martín
d90f068c73 Merge pull request #3085 from consul/backport-1196-fix_flaky_legislation_random_order_spec 
Fix flaky spec: Legislation Proposals Each user has a different and consistent random proposals order
 2018-12-05 19:16:43 +01:00
rgarcia
b601f6c33f adds method voted_by?(user) to polls 2018-12-05 14:31:58 +01:00
Alberto Garcia Cabeza
54fbae6339 adds links to login or verification on question answers 2018-12-05 14:31:58 +01:00
Javier Martín
fc5a5e58de Merge pull request #3073 from consul/backport-rename_hidden_proposals 
[Backport] Rename Admin::Proposals to Admin::HiddenProposals
 2018-12-05 13:30:23 +01:00
Javi Martín
09add3554f Create less records in random pagination tests 
We make the tests considerably faster, we make them more robust against
changes in the number of records shown per page, and we generate enough
records so the chance of randomly getting the same results twice in a
row is extremely low.
 2018-12-05 13:11:23 +01:00
Javi Martín
64167a86b4 Be more consistent using double quotes 2018-12-05 13:11:23 +01:00
Javi Martín
637c188bee Make test easier to follow 
Checking the contents of the second page while on the second page makes
more sense than checking them after going back to the first page.
 2018-12-05 13:11:22 +01:00
Javi Martín
f391023b7d Group related specs together 2018-12-05 13:08:24 +01:00
Javi Martín
6f62d76c71 Simplify random seed conversion to float 
The method `to_f` already returns `0.0` instead of raising an exception
when handling non-numeric values.
 2018-12-05 13:03:10 +01:00
Javier Martín
4f9ca04a84 Merge pull request #3057 from consul/backport-make-milestones-polymorphic 
[Backport] Make milestones polymorphic
 2018-12-05 12:12:04 +01:00
Julian Nicolas Herrero
99abc712fe Merge pull request #3065 from microweb10/poll_question_create_from_proposal_show 
Add missing feature spec: Admin poll questions Create from successful proposal show
 2018-12-05 10:11:08 +01:00