Commit Graph

3354 Commits

Author SHA1 Message Date
Alberto
9475a0c6ee Merge pull request #3249 from consul/custom-pages
Refactor processes header colors and custom pages
2019-01-30 20:05:20 +01:00
Julian Nicolas Herrero
0e9fd645e8 Merge pull request #3234 from consul/use_find_instead_of_find_by_id
[Backport] Use find instead of find_by_id
2019-01-30 19:46:22 +01:00
decabeza
773302f0d7 Show only random order for unfeasible and unselected investments 2019-01-30 14:16:25 +01:00
decabeza
9edabb5bf4 Fix links on budgets index page 2019-01-30 14:15:40 +01:00
decabeza
cdb66ce23c Refactor header process colors specs 2019-01-30 13:17:35 +01:00
decabeza
2695e19e2f Fix hound warnings 2019-01-29 17:54:02 +01:00
Julian Nicolas Herrero
81b65ec821 Merge pull request #3202 from consul/sort_legislation_processes_by_start_date
Sort Legislation Processes by descending start date
2019-01-29 17:30:02 +01:00
Alberto
41fe1e3922 Merge pull request #3152 from NahiaSolutions/add_image_to_legislation_processes
Add image to legislation processes and banner colors
2019-01-29 16:06:54 +01:00
Alberto
ebe5bf13e7 Merge pull request #3149 from NahiaSolutions/add_cards_to_custom_pages
Add cards to custom pages
2019-01-29 16:05:47 +01:00
Alberto
78479ff0e7 Merge pull request #3228 from consul/milestones_public_progress_bar
[Backport] Add progress bars to milestones public view
2019-01-29 14:12:08 +01:00
Alberto
bd4826b25e Merge branch 'master' into add_cards_to_custom_pages 2019-01-28 14:49:39 +01:00
Alberto
c297595e49 Merge branch 'master' into add_image_to_legislation_processes 2019-01-28 14:49:19 +01:00
Julian Herrero
9a23393535 Use find instead of find_by_id
This method will raise an exception if resource is not found when
trying to call score_action on nil.
Prefer to raise a 404 HTML NotFound error instead.
2019-01-25 09:03:56 +01:00
Julian Herrero
8f112cf37e Allow admins delete poll answer documents 2019-01-24 19:19:04 +01:00
decabeza
d650b90e25 Adds missing backport content on progressable specs 2019-01-24 18:33:26 +01:00
Alberto
5d790eae67 Merge pull request #3230 from consul/admin-images-map
[Backport] Allow change map image from admin
2019-01-24 17:48:02 +01:00
Javi Martín
97ef69ee33 Rename progressable specs to admin_progressable
We're going to introduce progress bars in the public view as well, and
it's more consistent with "admin_milestoneable".
2019-01-24 17:39:42 +01:00
Javi Martín
b552f6e70b Add heading to milestones progress bars 2019-01-24 17:33:43 +01:00
Javi Martín
e73f3bd97a Add progress bars to milestones public view 2019-01-24 17:33:34 +01:00
decabeza
045c4eca64 Allow change map image from admin site customization
Also adds on site customization image.rb jpeg content type to allow replace this image.
2019-01-24 14:55:01 +01:00
decabeza
62088bc635 Hide poll results and stats to admins 2019-01-24 14:33:41 +01:00
Alberto
227f496f6d Merge pull request #3195 from consul/milestone_progress_bar
[Backport] Manage milestone progress bars
2019-01-24 11:59:24 +01:00
decabeza
75531c6c80 Show current phase as selected on phase select on admin budgets form 2019-01-23 14:30:35 +01:00
Manu
abcb96ffda added test spec for creation of legislative process with image 2019-01-22 16:32:05 -05:00
Julian Herrero
33d6f6c18d Sort Legislation Processes by descending start date 2019-01-22 18:51:22 +01:00
Manu
14d64e94d0 rspec tests were added for the process banner 2019-01-21 12:02:27 -05:00
Javi Martín
486100bf53 Add specs for custom page cards 2019-01-21 10:40:24 -05:00
Javi Martín
2926e4e375 Fix managing widget cards for homepage
The condition `params[:page_id] != 0` didn't work properly when editing
the homepage because in that case the parameter was `nil`, and the line
`SiteCustomization::Page.find(@card.site_customization_page_id)` raised
an exception because it couldn't find a page with a `nil` ID.

Fixing the issue while maintaining the check against `0` lead to complex
code, and so allowing `nil` in the database and assuming cards with no
`site_customization_page_id` belonged in the homepage seemed to be the
easiest solution.
2019-01-21 10:40:14 -05:00
Manu
162b61f94c updated test file for cards 2019-01-18 09:54:43 -05:00
decabeza
7c0fb96b02 Adds styles to admin progress bars views 2019-01-18 14:17:40 +01:00
Javi Martín
dfdf0b0636 Hide title field for primary progress bars
These bars don't have a title.
2019-01-18 14:17:37 +01:00
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
eaea95ccfb Add progress bar model 2019-01-18 14:17:12 +01:00
Javi Martín
c3c9b02220 Move milestone factories to their own file 2019-01-18 14:15:27 +01:00
Julian Nicolas Herrero
357d0617e2 Merge pull request #3174 from consul/backport-1736-pending_specs_proposal_notification_limits
[Backport] Add pending specs proposal notification limits
2019-01-18 11:06:03 +01:00
decabeza
9dfbeed140 Moves draft and final result publication dates from tabs to sidebar 2019-01-15 16:13:41 +01:00
decabeza
73637de0d0 Adds homepage phase and tab to legislation processes show 2019-01-15 16:13:38 +01:00
Julian Herrero
ab1e9a9310 Fix typo 2019-01-14 18:48:31 +01:00
Julian Herrero
2331cd048e Add pending specs for proposal notifications limits 2019-01-14 18:48:16 +01:00
Julian Herrero
d77183ee09 Improvement - CRUD budgets and content blocks 2019-01-14 12:59:48 +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 Nicolas Herrero
702dc2bef5 Merge pull request #3154 from consul/backport-check_for_deleted_proposals
[Backport] checks for deleted proposals
2019-01-09 17:57:01 +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
Javier Martín
90a66239a5 Merge pull request #3151 from consul/backport-fix_admin_investments_default_order
Add default order for admin budget investments list
2019-01-09 15:46:52 +01:00
Javi Martín
7c06320f39 Fix typo 2019-01-09 12:55:27 +01:00
Javi Martín
be864ee92f Make sure selected investment is visibile in spec
After changing the order for budget investments, the selected investment
didn't appear on the first page anymore, and so it couldn't be clicked
on during the test.
2019-01-09 12:55:22 +01:00
Alberto
bbcb96027b Merge pull request #3137 from consul/key-dates-processes
[Backport] Processes key dates
2019-01-08 10:51:40 +01:00
rgarcia
e3eb87addb checks for deleted proposals 2019-01-04 15:25:13 +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