consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,239 Commits 1 Branch 0 Tags
6cf66fc58ae79ebaef39daed1a63fbb138e240a1
Commit Graph

1805 Commits

Author SHA1 Message Date
Julian Nicolas Herrero
4a12425987 Merge pull request #3296 from consul/make_budgets_translatable 
[Backport] Make budgets translatable
 2019-02-13 19:01:13 +01:00
Julian Herrero
922600252c Make budget headings translatable 2019-02-13 13:35:07 +01:00
Julian Herrero
1c35ec99c1 Make budget groups translatable 2019-02-13 12:30:37 +01:00
Julian Herrero
90d0a6e416 Make budget phases translatable 2019-02-13 11:44:56 +01:00
Julian Herrero
d76782f150 Make budgets translatable 2019-02-13 11:41:58 +01:00
Julian Herrero
5f4a369606 Deleting a booth shift with recounts or partial results. 
Show a flash message that it's not possible to delete booth shifts
when they have associated recounts or partial results. Before an
execption was raised.
 2019-02-12 18:59:51 +01:00
Alberto
f9b18667e6 Merge pull request #3280 from consul/next-filters 
[Backport] Removes next/incoming filters
 2019-02-11 20:43:09 +01:00
Julian Nicolas Herrero
5a50992773 Merge pull request #3275 from consul/legacy_legislation_cleanup 
LegacyLegislation migration cleanup
 2019-02-08 20:04:19 +01:00
decabeza
33fabe18b8 Remove admin legislation processes past filter 2019-02-08 14:30:08 +01:00
decabeza
060a4c684f Remove legislation processes next filter 2019-02-08 14:29:43 +01:00
decabeza
bc1679550b Remove incoming polls filter 2019-02-08 14:28:19 +01:00
Julian Herrero
54e59a8a58 LegacyLegislation migration cleanup 
These legacy models are not used anymore.
 2019-02-06 17:07:38 +01:00
Julian Herrero
c9522b424b Show unfeasible and unselected investments for finished budgets 
We were filtering by winners investments for finished budget without
having in consideration other filters.
We want the default filter to be `winners` for finished budgets.
 2019-02-06 13:50:50 +01:00
Alberto
282ae61139 Merge pull request #3252 from consul/custom-pages-cards 
Allow select column width for widget cards
 2019-02-05 17:37:46 +01:00
decabeza
dfd4f60e15 Order admin poll list by starts_at date 2019-01-31 18:49:24 +01:00
decabeza
64cbed838a Fix hound warnings 2019-01-31 17:23:45 +01:00
decabeza
e7fcf2ce35 Add select on cards form to select the number of columns 2019-01-31 17:06:01 +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
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
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
3bf2fa1b17 Add method find_by_slug_or_id to Sluggable module 
Make it easier to find by slug or id for sluggable models. Will return
nil if resource is not found.
 2019-01-25 09:08:28 +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
23b6e38915 Remove unused before_action 2019-01-25 08:54:28 +01:00
Julian Herrero
0af5972d63 Use correct param in controller 2019-01-25 08:48:44 +01:00
rgarcia
dacc2d529d Fix destroy document specs 
We were linking to the document url itself, which does not have a route
associated and so the specs fails

With this commit we are using the correct path to the destroy action of
the DocumentsController.

We are also using the referrer instead of a params[:from] attribute, as
it avoids having to pass an extra parameter, making the code prettier
and it works the same way
 2019-01-24 21:39:43 +01:00
Julian Herrero
33d6f6c18d Sort Legislation Processes by descending start date 2019-01-22 18:51:22 +01:00
Manu
bd4e12112d Add image to legislation processes and banner colors 2019-01-21 12:02:27 -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
Javi Martín
9c050ca6bd Extract method to redirect when managing cards 2019-01-21 10:40:04 -05:00
Javi Martín
8a643c72e7 Use I18n for card notice messages 2019-01-21 10:39:42 -05:00
Manu
bff3a3b379 use relation between cards and page models 2019-01-18 09:54:43 -05:00
Manu
7657a0e0b4 added i18n text to custom pages cards 2019-01-18 09:54:43 -05:00
Manu
2dd953bdfd added hound corrections and removed wrong tables form the schema.rb 2019-01-18 09:54:43 -05:00
Manu
722a431b54 Add cards to custom pages 2019-01-18 09:54:43 -05: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
f2210bc5b5 Update changelog for release 0.18.1 2019-01-17 13:17:38 +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