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

11315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Javier Martín
a1df90c1b7 Merge pull request #3097 from consul/fix_milestone_translations_migration 
Fix budget investment milestone translations migration
 2018-12-12 14:48:59 +01:00
Javi Martín
1ff6390950 Fix proposal info rendering for managers 
We were looking for the partial in management/proposals/info instead of
proposals/info.
 2018-12-12 13:43:03 +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
f96cab2f1c Update references to investment status 
We've made milestone status polymorphic, and so the texts need to be
updated.
 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
87f7e6aa2e Extract milestones content into a partial 
We aren't going to use the `.tabs-panel` part when rendering milestones
in legislation processes.
 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
Javi Martín
7891efee32 Add milestones to proposals 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
Javi Martín
64d6b7491a Make partial listing milestones reusable 
So it isn't specific to budget investments anymore.
 2018-12-11 19:22:55 +01:00
Javi Martín
6f342baf7d Move milestones scope to milestoneable concern 2018-12-11 19:22:55 +01:00
Javi Martín
abe8527e54 Randomize milestones per record in dev seeds 2018-12-11 19:22:55 +01:00
Javi Martín
1c531cfc00 Randomize milestones publication date in dev seeds 2018-12-11 19:22:55 +01:00
Javi Martín
2fdd367f22 Move milestone dev seeds to their own file 2018-12-11 19:22:55 +01:00
Julian Herrero
fcfee3a906 apply missing requeriments in PR #3043 
In this PR https://github.com/consul/consul/pull/3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
 2018-12-11 18:21:14 +01:00
Julian Nicolas Herrero
9e759e0a39 Merge pull request #3043 from milber/content_blocks_for_headings 
Added feature to add content block to headings in sidebar
 2018-12-11 16:44:02 +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
Javi Martín
b685419b28 Fix "Remove obsolete model usage" 
We accidentally changed the schema when modifying an existing migration.
It wasn't critical because we're going to remove that table in the
future, but it resulted in conflicts for users who had already run the
migration before its modification.

This commit fixes commit 4a7f479.
 2018-12-11 13:54:38 +01:00
Alberto
05abcbe944 Merge pull request #3081 from consul/featured-proposals 
[Backport] Featured proposals
 2018-12-10 22:17:51 +01:00
Alberto
22790535c7 Merge pull request #3080 from consul/ui-design 
[Backport] UI design
 2018-12-10 22:16:32 +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
414a8031a0 Merge pull request #3088 from consul/pull_request_template 
Simplify pull request template
 2018-12-10 20:08:10 +01:00
Javier Martín
feb4af21c7 Merge pull request #3083 from consul/backport-milestone_polymorphic_path 
Make milestones controller polymorphic
 2018-12-10 18:37:15 +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
Raimond Garcia
3781a9920e Merge pull request #3093 from salbertson/patch-1 
Add a "Reviewed by Hound" badge
 2018-12-10 10:32:53 +01:00
Raimond Garcia
74f7be540f Merge pull request #3037 from PierreMesure/add-web-sections-to-seeds 
Add web sections to seeds
 2018-12-10 10:30:24 +01:00
Scott Albertson
be9e046d68 Add a "Reviewed by Hound" badge 2018-12-09 18:36:15 -08: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
Pierre Mesure
3fcd701723 Add websections at the end of the seeds 2018-12-07 14:48:21 +01:00
Javi Martín
6a5e5729dd Simplify pull request template 2018-12-07 13:57:32 +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
Julian Nicolas Herrero
6ee8b328ef Merge pull request #3067 from microweb10/issue-3051 
Fix failing spec: Budget::Investment Reclassification store_reclassified_votes stores the votes for a reclassified investment
 2018-12-05 17:21:38 +01:00
rgarcia
b601f6c33f adds method voted_by?(user) to polls 2018-12-05 14:31:58 +01:00