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

6128 Commits

Author SHA1 Message Date
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
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
Javi Martín
70b4225542 Extract partial to display language tabs 2018-12-12 15:15:00 +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
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
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
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
Javi Martín
df29b49d05 Make milestones view 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
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
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
Alberto
22790535c7 Merge pull request #3080 from consul/ui-design 
[Backport] UI design
 2018-12-10 22:16:32 +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
feb4af21c7 Merge pull request #3083 from consul/backport-milestone_polymorphic_path 
Make milestones controller polymorphic
 2018-12-10 18:37:15 +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
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
Alberto Garcia Cabeza
54fbae6339 adds links to login or verification on question answers 2018-12-05 14:31:58 +01:00
Javier Martín
3631ff7340 Merge pull request #3074 from consul/backport-refactor_legislation_process_subnav 
Refactor legislation process subnav
 2018-12-05 13:32:22 +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
Julian Herrero
0fc1e0503e store reclassified votes in order 
Make sure we create Budget::ReclassifiedVotes for an investment in the
same order that the previous Budget::Ballot:Lines were previously created.
 2018-12-05 13:13:49 +01:00
Javi Martín
1b46ba9ee6 Make legislation proposals random seed more robust 
Using a number with only two decimals means the seed is going to be the
same 1% of the time. Using ruby's default value for random numbers makes
it almost impossible to generate the same seed twice.

Using `rand` also simplifies the code, and it's what we use in the
budget investments controller.
 2018-12-05 13:03:10 +01:00
Javi Martín
07c22d289c Change the random seed before storing it 
Even though it probably doesn't change the behaviour, it's a bit strange
to set a seed, then storing it in the session, and then modifying it
again.
 2018-12-05 13:03:10 +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
Javi Martín
ba7ca11cd8 Fix buggy parallel assignment 
In ruby, when we assign two variables to one value, the second variable
is set to `nil`.
 2018-12-05 13:02:39 +01:00
Javi Martín
35c18688e5 Remove obsolete method 
It was used in the `Translatable` concern, but it isn't used there
anymore.
 2018-12-05 12:28:36 +01:00
Javi Martín
ae22cd247a Use milestoneable to find/create a milestone 
This way we simplify the code and avoid strange cases like `params[:id]`
having an ID which doesn't belong to the current milestoneable.
 2018-12-05 12:28:36 +01:00
Javi Martín
c4448faf70 Move milestones code to admin/milestones 
All milestone controllers will inherit from `AdminMilestonesController`,
and all views will render the same content.
 2018-12-05 12:28:34 +01:00
Javi Martín
2e778b4073 Use milestoneable instead of investment 2018-12-05 12:23:57 +01:00
Javi Martín
2c2831beb0 Use polymorphic paths for milestones 2018-12-05 12:23:52 +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