consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

6051 Commits

Author SHA1 Message Date
lalo
23d36835d7 Add Admin changes to create Poll:Questions with votation type 2019-06-12 19:44:14 +02:00
lalo
7c9c50f4c6 Add Model changes to work with votation_types 2019-06-12 19:32:41 +02:00
German Galia
74083df10f Add historic fields to participatory budget 2019-06-12 18:03:53 +02:00
German Galia
9ce524e1f3 Create tracker rol 2019-06-12 16:23:40 +02:00
German Galia
16ffa2a259 Add change log in investment participatory budget 2019-06-12 13:06:20 +02:00
Raimond Garcia
259e05c3e0 Merge pull request #3410 from LextrendIT/report_generation 
Report generation, download CSV
 2019-06-12 11:45:59 +02:00
German Galia
9d1ca3bfd4 Report generation. Download csv 2019-06-12 10:17:31 +02:00
Raimond Garcia
22787151f5 Merge pull request #3439 from LextrendIT/feature/add_admin_investments_column_chooser 
Add columns selector JS component and change Rails view to use it
 2019-06-11 17:17:52 +02:00
Raimond Garcia
e0e1e1dac1 Merge pull request #3437 from LextrendIT/feature/add_valuator_role_actions_manager 
Add abilities to valuator model for comment and edit dossiers
 2019-06-11 17:13:13 +02:00
Raimond Garcia
c1b14943e6 Merge pull request #3473 from LextrendIT/3463_collaborative_legislation_summary 
Collaborative legislation summary
 2019-06-11 16:41:45 +02:00
lalo
c2860dda0e Add can_comment and can_edit_dossier abilities to valuators 2019-06-11 16:24:02 +02:00
Raimond Garcia
d266cb33ce Merge pull request #3427 from LextrendIT/feature/unify_valuator_and_admin_investment_pages 
Display preview public page component on admin and valuators investment page
 2019-06-11 14:44:45 +02:00
Julian Nicolas Herrero
c7ea0528e0 Merge pull request #3603 from consul/admin_stats_before_voting_phase 
Avoid error when accessing final voting stats before the balloting phase
 2019-06-11 14:34:42 +02:00
lalo
4740aeaddf Add columns selector JS component and change Rails view to use it 2019-06-11 14:33:40 +02:00
lalo
ef345ca87c Collaborative legislation summary 2019-06-11 14:31:44 +02:00
Raimond Garcia
139b2720d8 Merge pull request #3419 from LextrendIT/feature/add_tags_to_milestones 
Add tags to milestones
 2019-06-11 12:37:30 +02:00
Julian Herrero
fd71ed825b Avoid error when accessing final votes stats before balloting phase 
When accessing the URL `/admin/stats/budget_balloting?budget_id=X'
for a budget in a phase prior to the balloting phase, the following
error was raised due to the stats where not calculated yet.
Instead, we'll now show a flash message.

NoMethodError:
  undefined method `[]' for nil:NilClass
  ./app/controllers/admin/stats_controller.rb:82
 2019-06-10 17:28:16 +02:00
Senén Rodero Rodríguez
1c76493fa1 Prevent flaky specs because of globalize fallbacks initialization 
When any helper, lib, mailer, model or view spec is executed
after a feature, controller or request spec Globalize.fallbacks
returns nil and this can cause some flaky specs. With this
patch we are ensuring to initialize Globalize fallbacks
between specs.

Controller, feature and request specs do not need this patch
because of application_controller is currently initializing
Globalize.fallback on each request.
 2019-06-07 19:55:01 +02:00
lalo
be8a0dbe8a Add Milestone tag select filter on executions public page 2019-06-07 14:17:32 +02:00
lalo
63e0cd02d0 Display milestone_tags input for investments, display milestone_tags on admin and tests 2019-06-07 14:07:43 +02:00
lalo
3282606be2 Add act_as_taggable_on milestoneable concern 2019-06-07 14:07:43 +02:00
lalo
46e5d6a9fa Create Legislation::PeopleProposal model 2019-06-06 17:22:49 +02:00
Javi Martín
0cca8c2cc1 Check the comment is present after commenting 
We've got a bug which causes the admin description not to appear
immediately after commenting, due to the `admin_layout` variable being
false when we add a comment using an AJAX request.

So the test reloaded the page to check the admin description was there.
However, sometimes reloading the page is faster than the AJAX request,
and so the comment is not there yet.

By checking the results of the AJAX request before reloading the page,
the test passes.

A proper solution would be to display the admin description or name
right after the comment is added.
 2019-06-06 14:18:32 +02:00
Javier Martín
b14661e378 Merge pull request #3581 from consul/duplicate_translations 
Avoid duplicate records using translations
 2019-06-06 13:08:05 +02:00
Javi Martín
da59315530 Don't show links to budget results if disabled 2019-06-06 12:18:05 +02:00
Raimond Garcia
a874d25bfa Merge pull request #3413 from LextrendIT/feature/notify_evaluation_comments 
notify by email new evaluation comments
 2019-06-06 11:29:38 +02:00
Javier Martín
72c6b05c64 Merge pull request #3376 from LextrendIT/3350_rename_debates_comments_admin 
Refactor admin/debates and admin/comments to hidden
 2019-06-05 19:15:21 +02:00
Julian Nicolas Herrero
7802305b18 Merge pull request #3585 from consul/images_and_documents_settings 
Images and documents settings
 2019-06-05 19:11:22 +02:00
Javier Martín
81b67349f2 Merge pull request #3580 from consul/use_find_instead_of_find_by_id 
Use find instead of find by
 2019-06-05 19:04:47 +02:00
Javier Martín
cbad8ad416 Merge pull request #3389 from LextrendIT/feature/add_description_field_to_administrator_users_like_evaluators 
Add description field to administrator users like evaluators description
 2019-06-05 18:36:16 +02:00
lalo
28815cb290 Create new email template for new evaluation comment created and add it to system_emails view 2019-06-05 16:22:12 +02:00
lalo
d721920b97 Display commenter as admin description or name 2019-06-05 16:19:31 +02:00
lalo
d0e1eff532 Add description field to administrator users like evaluators description 2019-06-05 16:18:12 +02:00
Julian Herrero
1f76b25e2a Show name and email for deleted poll officer's user account 
Avoid to raise an exception `Module::DelegationError' when trying to
show the name and/or email of a poll officer whose user account has
been deleted.
We'll show a message "User deleted" and "Email deleted" instead.
 2019-06-04 18:55:51 +02:00
Julian Herrero
8e0bbf54f6 Replace harcoded images and documents settings 2019-06-04 11:50:09 +02:00
Julian Herrero
220bfb065a Add images and documents settings to admin panel 2019-06-04 11:47:22 +02:00
Julian Herrero
e32faf3a3c Extract setting prefix to a method 
We may need to access the setting key prefix in the future, so it's
better to have it in a method to avoid duplication
 2019-06-04 11:39:53 +02:00
lalo
c538d08fee Display public investment view on admin and valuator pages as preview 2019-06-04 09:30:51 +02:00
Javi Martín
481184e7f3 Fix accidental translations join 
We added the code thinking we were ordering by the name of the poll, but
here we're actually ordering by the name of the booth.
 2019-06-03 18:36:03 +02:00
Javi Martín
dadbf873ba Order translations using ruby 
Joining the translations table caused duplicate records to appear.
Ordering with SQL is simply too hard because we need to consider
fallback locales.

Thanks Senén for providing most of the tests in the poll spec.
 2019-06-03 18:35:59 +02:00
Julian Herrero
b122302c58 Use find instead of find_by_id 
Better raise a 404 HTML NotFound exception than any other unexpected error.
 2019-06-03 17:54:19 +02:00
rgarcia
998b4d9e39 Load budgets using slugs 2019-06-03 16:54:39 +02:00
German Galia
4f50e67ac3 Collaborative legislation summary 2019-06-03 12:34:25 +02:00
Javier Martín
90c1d681d0 Merge pull request #3576 from consul/new_settings 
Add new settings automatically on every deployment
 2019-06-03 11:54:44 +02:00
German Galia
85722eb7c4 Rename admin/debates and admin/comments to hidden 2019-06-02 19:12:26 +02:00
Alberto
2f8505332e Merge pull request #3574 from consul/remove-dashboard-polls 
Allow users to delete dashboard polls
 2019-06-01 11:06:34 +02:00
Alberto
8ee396f311 Merge pull request #3573 from consul/improve-ux 
Add help texs, links and new message section to improve UX
 2019-06-01 10:38:52 +02:00
Alberto
51e27fb6ed Merge pull request #3572 from consul/user-polls 
Hide polls created by users from proposals dashboard on admin poll index
 2019-06-01 10:38:07 +02:00
Javi Martín
bb504d90fb Add method to add new settings 2019-05-31 19:33:31 +02:00
voodoorai2000
cb9c3696f4 Use budget investments in useful specs 2019-05-31 18:23:03 +02:00