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

6027 Commits

Author SHA1 Message Date
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
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
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
88a912061a Merge pull request #3025 from microweb10/issue-3024 
improve visualization for small resolution
 2018-12-02 20:00:42 +01:00
Julian Nicolas Herrero
ec152a9d4f Merge pull request #3061 from microweb10/issue-3060 
Fix failing spec: Poll::Shift officer_assignments creates and destroy corresponding officer_assignments
 2018-12-02 19:22:07 +01:00
Javi Martín
9ad8c5728a Refactor legislation process subnav 2018-11-30 18:09:52 +01:00
Javi Martín
abf48af331 Rename draft_texts key to draft_versions 
This way we can refactor the legislation tabs, since now all translation
keys follow the same convention (using the same name as the active tab
name).
 2018-11-30 18:09:51 +01:00
Javi Martín
5cfc1592e4 Use %w[] instead of %w{} 
As defined in our rubocop rules.
 2018-11-30 18:04:55 +01:00
Javi Martín
b499c88373 Extract method in menu moderated content 
This way we can make a long line considerably shorter.
 2018-11-30 18:04:55 +01:00
Javi Martín
45a41a7528 Rename Admin::Proposals to Admin::HiddenProposals 
The same way we do it with users and budget investments.
 2018-11-30 18:04:55 +01:00
Marko Lovic
c0f6fa182f Make Milestones general, and not specific to Budget Investments 
Generalize the Budget::Investment::Milestone model to a
polymorphic Milestone model so it can be used for entities
other than Budget::Investment.
 2018-11-30 14:15:21 +01:00
Marko Lovic
81f516efd7 Change BudgetInvestmentStatus to Milestone::Status 
Generalize the BudgetInvestmentStatus model to Milestone::Status so it
is not specific to budget investments, but can be used for any entity
which has milestones. This is in preparation to make the Milestone
model polymorphic and usable by entities other than budget investments.
 2018-11-30 14:15:21 +01:00
Javi Martín
56df8050df Use @cards.each instead of @cards.find_each 
Using `find_each` ignores the scope order we set in `Widget::Card.body`,
and since we don't expect to have thousands of cards, using batches
isn't necessary.

This way we remove the "WARN Scoped order and limit are ignored, it's
forced to be batch order and batch size" message we were getting in the
specs.
 2018-11-29 20:10:23 +01:00
Raimond Garcia
e23fbc8d58 Merge pull request #2970 from PierreMesure/Remove-icon-png-from-settings 
Removed icon_home and fixed corresponding test
 2018-11-27 11:11:51 +01:00
Raimond Garcia
1b7a2adf56 Merge pull request #3034 from behraaang/bugfix/pagination-after-select 
Fix pagination after selecting/unselecting budget investment
 2018-11-27 11:04:41 +01:00
Raimond Garcia
2ef83619c3 Merge pull request #3048 from jaflutz/2930-draft-phase-processes 
Adds draft phase functionality in legislation processes
 2018-11-27 11:01:27 +01:00
Alberto
1bb50cbe47 Merge pull request #3056 from consul/administrator-id 
[Backport] Administrator ID
 2018-11-26 15:05:11 +01:00
Alberto
f535a90826 Merge pull request #3055 from consul/admin-poll-officers 
[Backport] Admin poll officers
 2018-11-26 15:03:55 +01:00
Alberto
1a89e52931 Merge pull request #3054 from consul/globalize-tabs 
[Backport] Globalize tabs
 2018-11-26 14:58:38 +01:00
Julian Herrero
c563f73189 create officer assignments in order 
Make sure we create the Poll::OfficerAssignments in the same order the
booth_assignments where previously created. So the spec "Poll::Shift
officer_assignments creates and destroy corresponding
officer_assignments does" not fail.
 2018-11-23 18:15:47 +01:00
decabeza
6d7c5f1b78 Refactors admin administrators spec 
This refactoring avoids "Use let instead of an instance variable" rubocop warning
 2018-11-22 11:41:59 +01:00
decabeza
ae3a2ed3f3 Adds administrator id on admin administrators index page 2018-11-22 11:41:54 +01:00
decabeza
3670859fa3 Removes unused admin poll officers views, routes and controller 2018-11-22 11:40:11 +01:00
decabeza
8f27398bd1 Fixes globalize tabs when there is a lot of available locales 2018-11-22 11:37:26 +01:00
decabeza
2c06008370 Improves social share message to budget investments 2018-11-22 11:35:09 +01:00
João Lutz
34b58a5208 Adds draft phase functionality in legislation processes 2018-11-19 22:18:50 -02:00
decabeza
46671fe447 Removes unnecessary pages 2018-11-15 11:52:57 +01:00
decabeza
b364e0ec38 Improves pages markup 2018-11-15 11:05:50 +01:00
decabeza
315ed77618 Removes unnecessary condition 2018-11-14 13:56:14 +01:00
Alberto
7a76f3780b Merge pull request #3040 from consul/help-feature 
[Backport] Help feature
 2018-11-14 13:32:35 +01:00
decabeza
3a718d88c0 Shows help link only if feature is enabled 2018-11-14 12:45:52 +01:00
decabeza
5abeeb8588 Fixes date format on legislation helper 2018-11-14 12:41:22 +01:00
Raimond Garcia
6cfd0c2e13 Merge pull request #3030 from consul/fix-poll-results-accuracy 
Fix poll results accuracy
 2018-11-13 14:03:49 +01:00
Alberto
56a2978b87 Merge pull request #3033 from consul/budgets-unselected-message 
[Backport] Budgets unselected message
 2018-11-12 18:22:54 +01:00
decabeza
dfa7148406 Shows unselected message only on balloting or later phase 2018-11-12 17:23:58 +01:00
decabeza
13b3d9cebc Fixes admin menu link when create a new widget 2018-11-12 17:11:17 +01:00
Alberto
06969e0ec7 Merge pull request #3027 from microweb10/issue-3026 
Improve action buttons aspect for small screens
 2018-11-12 15:38:13 +01:00
Juanjo Bazán
4cccb93677 fix poll accuracy results using floats 2018-11-11 14:54:35 +01:00
behraaang
3278b35729 partial added, render an investment 2018-11-10 23:08:11 +03:30
Julian Herrero
085a01a493 improve action buttons aspect for small screens 2018-11-08 16:45:50 +01:00
Julian Herrero
3975e5145a improve action buttons aspect for small screens 2018-11-08 16:45:36 +01:00
Julian Herrero
bb81a4dad4 improve action buttons aspect for small screens 2018-11-08 16:45:07 +01:00
Julian Herrero
62a4fe985e improve action buttons aspect for small screens 2018-11-08 16:44:09 +01:00