Commit Graph

6156 Commits

Author SHA1 Message Date
decabeza
4cda7d1d9f Shows documents title only if there is any document 2018-12-26 12:03:46 +01:00
Alberto
63f7c18399 Merge pull request #3123 from consul/admin-questions
[Backport] Admin poll questions index
2018-12-26 11:32:28 +01:00
Javi Martín
e34a827c48 Add translations for rails date order
Not doing so caused crashes on applications which don't fall back to
English when a translation is missing.

We're adding them in a separate file so we can exclude it from crowdin
and so translators don't translate symbols as if they were words which
need translation.
2018-12-21 19:31:15 +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
fd681c17df Fix crash in valuation when there are no budgets 2018-12-21 17:24:34 +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
decabeza
9c827d6ce0 Adds poll name on admin poll questions index 2018-12-19 21:00:09 +01:00
Alberto
d4013ee664 Merge pull request #3122 from consul/proposal-create-question
[Backport] Proposal create question
2018-12-19 19:55:24 +01:00
decabeza
aebd29f7e2 Adds create question button to admin proposals show 2018-12-19 16:08:57 +01:00
decabeza
5a027f3a0a Removes create question button on proposals index and show 2018-12-19 13:55:00 +01:00
decabeza
7316c16edd Adds price explanation link on budget investments show 2018-12-19 13:52:17 +01:00
Javier Martín
51f72ca812 Merge pull request #3113 from consul/fix_scroll
Fix scroll jump voting investments
2018-12-19 12:39:49 +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
Javi Martín
ef9f271c89 Fix scroll jump voting budget investments
Removing the padding in the investments header nav bar means it doesn't
leave any empty space when its position changes to a fixed one.
2018-12-18 13:25:51 +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
ff9a32c0a5 code reviewed 2018-12-15 18:04: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
8fb8f70efd cleanup (due to new CRUD for budget groups and headings) 2018-12-14 15:37:25 +01:00
Julian Herrero
25e1afea48 fix map rendering for budget headings 2018-12-14 15:37:22 +01:00
Alberto
b701a86c1b Merge pull request #3105 from consul/draft-processes
[Backport] Draft phase on legislation processes
2018-12-13 15:53:11 +01:00
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