Commit Graph

2027 Commits

Author SHA1 Message Date
Javi Martín
c5d32c5ab9 Manage progress bars in the admin area 2019-01-18 14:17:33 +01:00
Javi Martín
4f25581636 Add progress bar polymorphic views 2019-01-18 14:17:29 +01:00
Javi Martín
f2210bc5b5 Update changelog for release 0.18.1 2019-01-17 13:17:38 +01:00
rogelio-o
f1bb1ff8de Moves attributes to a concern. 2019-01-14 20:26:47 +01:00
rogelio-o
ea76179002 Solves #3153. It refactors images attributes. 2019-01-12 17:42:55 +01:00
Anna Anks Nowak
3ab70ff0d8 Move validating params to model 2019-01-10 16:11:51 +01:00
Anna Anks Nowak
cb761c56c2 Fix issue with app crashing when sort_by param was incorrect 2019-01-10 16:11:51 +01:00
Anna Anks Nowak
2523775d9f Make the conditional more readable temporarily 2019-01-10 15:35:54 +01:00
Anna Anks Nowak
9786b0bf7d Rewrite sorting to support direction param [#2931] 2019-01-10 15:34:33 +01:00
Julian Nicolas Herrero
cc288fcedd Merge pull request #3167 from consul/backport-1793-cleanup_lines_controller
[Backport] Remove before action not used
2019-01-10 09:38:07 +01:00
Julian Nicolas Herrero
cd59f1b803 Merge pull request #3133 from consul/backport-1775-bug_management_create_investment_without_location
[Backport] Bug Management Cannot create Budget Investment without a map location
2019-01-09 18:02:53 +01:00
Julian Herrero
0858f4c6f4 cleanup (remove unused code) 2019-01-09 17:49:46 +01:00
Julian Nicolas Herrero
7ccab504f0 Merge pull request #3160 from consul/backport-1784-consistency_remove_semicolon_from_controllers
[Backport] Remove semicolons from controllers
2019-01-09 17:46:32 +01:00
Julian Nicolas Herrero
08a692341a Merge pull request #3150 from consul/backport-1769-crud_budget_and_usa
[Backport] new CRUD budgets, content blocks and heading map
2019-01-09 17:35:46 +01:00
Julian Herrero
9a60135d9f [Consistency] remove semicolons from controllers 2019-01-08 15:46:46 +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
Julian Herrero
2081269a67 fix Hound violations 2019-01-02 10:46:31 +01:00
rgarcia
82a2dd622b hotfix to load categories on error 2018-12-28 09:43:08 +01:00
Julian Herrero
bf7112f090 make parameter 'skip_map' accessible on creating an investment 2018-12-27 18:39:27 +01:00
Javi Martín
ee6ee3ca21 Update changelog for release 0.18 2018-12-27 12:29:21 +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
b0f1b6245e Simplify scope usage
Rails automatically calls the `id` method inside scopes and the variable
name makes more sense if it represents investments instead of the number
of investments.
2018-12-21 17:17:35 +01:00
Javi Martín
10e8117f83 Remove unnecessary line
We were assigning the same variable twice in a row, making the first
assignment useless.
2018-12-21 17:08:27 +01:00
decabeza
cf7155613e Changes honeypot family name to address on users sign up form 2018-12-21 11:34:12 +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
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
Javi Martín
e6a609e6e5 Extract method to filter investments by status 2018-12-14 18:15:51 +01:00
Javi Martín
b4b0b18a2d Extract method to get investment milestone status 2018-12-14 18:15:51 +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
Javi Martín
0de8c884ac Extract method to sort investments by heading 2018-12-14 17:26:54 +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
decabeza
df221b43a0 Fixes hound warnings on legislation processes 2018-12-12 18:23:11 +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
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
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
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
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
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
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
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