consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,723 Commits 1 Branch 0 Tags
68285aae06c6b4fb1a4cb15b4534a3af4ae6fcc3
Commit Graph

2545 Commits

Author SHA1 Message Date
rgarcia
a4f0161aa8 fixes specs related to ActionController params 2019-04-17 17:40:55 +02:00
alejandro
bafab3b769 fixes some deprecation warnings 2019-04-17 17:40:52 +02:00
rgarcia
1077a632cb permits parameters in urls 2019-04-16 17:28:07 +02:00
rgarcia
4bce38bd64 Fix deprecated devise syntax 
https://stackoverflow.com/questions/37341967/rails-5-undefined-method-fo
r-for-devise-on-line-devise-parameter-sanitizer
 2019-04-16 17:28:07 +02:00
alejandro
4c5d58448e fixes deprecation warning for uniq 2019-04-16 17:28:07 +02:00
Javier Martín
bc9d66ea31 Merge pull request #3432 from consul/fix_exception_with_wrong_token 
Fix exception when confirming an invalid token
 2019-04-10 18:55:44 +02:00
María Checa
394177213c Adds Ballot Sheet model and business logic 2019-04-10 16:04:39 +02:00
María Checa
ccf8d3a8e2 Adds ballot sheets controller and main views 2019-04-10 16:03:47 +02:00
Javi Martín
78c6395e5f Respond with 404 when confirming an invalid token 
We were getting a 500 Internal Server Error because `find_by` returned
`nil`, but the code assumed it returned an object responding to
`encrypted_password`. In this case, maybe some other status code (like
400 or 401) might be more appropriate, but I've kept 404 because it was
easier to implement and I wasn't sure which one was better.

Also note ideally we would test the controller using:

expect(response).to have_http_status(:not_found)

However, we would need to configure the test to show exceptions and not
to consider all requests local. I haven't been able to do so for
controller tests, and doing so for feature/request specs seems to
require changes in the test environment configuration which would affect
other tests.
 2019-04-10 12:41:21 +02:00
Javier Martín
3ccdf039e4 Merge pull request #3344 from consul/backport-budget_ballots 
Allow voting Budget Investments in booths
 2019-04-09 13:54:00 +02:00
decabeza
94b8caffca Merge branch 'master' into proposal-dashboard 2019-04-04 14:08:30 +02:00
lalo
237a03552f Move admin budget investments tabs filters to advanced filters component 2019-04-03 22:27:48 +02:00
decabeza
fcbb11b26e Hides question menu on budget poll and changes redirect when create 2019-04-03 22:23:32 +02:00
rgarcia
6fa7562181 Automatically create a budget poll if it does not exist 2019-04-03 22:23:22 +02:00
María Checa
22727a9876 Hides budget polls in polls public index 2019-04-03 22:22:45 +02:00
María Checa
acb0a6070e Hides budget polls in polls admin index 2019-04-03 22:20:10 +02:00
rgarcia
7dd314c699 Do not display polls associated to a budget in admin poll questions 
This section is used to select to which poll a question belongs to.

Budget polls are not meant to include questions that come from Citizen
Proposals or Government Questions, thus we do not display them
 2019-04-03 22:20:01 +02:00
Javi Martín
f7f9fc15a5 Move todays_booths_for_officer to the model 
This way we can easily add a test which will fail if by accident we
change the method to use `Date.today`. Until now using `Date.today`
would only fail if we ran specs in a time zone with a different date.
 2019-03-28 15:49:17 +01:00
Bertocq
69bcd8ec9a Set booth and officer assignments to Poll Voter on officing panel 2019-03-28 15:47:52 +01:00
Bertocq
80a9ba8aa7 Enable and fix booth selection back 2019-03-28 15:47:52 +01:00
Bertocq
77930d3275 Enable officing panel booth selection back 2019-03-28 15:47:52 +01:00
rgarcia
4761ac91bd Displays officing booth in layout 2019-03-28 15:47:52 +01:00
rgarcia
9c59c8b68e displays booth location instead of booth name 2019-03-28 15:47:52 +01:00
rgarcia
0286ca4c59 displays single booth for any number of polls 2019-03-28 15:47:52 +01:00
rgarcia
74706027cb fixes specs 2019-03-28 15:47:52 +01:00
rgarcia
b4499321d3 stores officer booth on sign in 2019-03-28 15:47:52 +01:00
rgarcia
5835d12694 stores the officer that allowed a voter to vote in a physical booth 2019-03-28 15:47:52 +01:00
rgarcia
cc4eed3500 fixes specs 2019-03-28 15:47:52 +01:00
decabeza
2af154d539 Merge branch 'master' into proposal-dashboard 2019-03-28 01:26:04 +01:00
decabeza
91be3cf775 Fix more hound warnings 2019-03-27 15:22:14 +01:00
decabeza
f47ec9d7dc Fix hound warnings 2019-03-26 18:21:19 +01:00
decabeza
eda6ea7f12 Merge branch 'master' into dashboard 2019-03-26 16:45:48 +01:00
Raimond Garcia
f6526f4a45 Merge pull request #3271 from Platoniq/dashboard-user-communication 
Dashboard user communication
 2019-03-26 12:10:18 +01:00
Javi Martín
4c35df4812 Use double quotes inside string interpolation 2019-03-25 14:58:54 +01:00
Javi Martín
2b4e1cf358 Add missing double quotes 
We overlooked a few single quotes while we changed thousands of them.
 2019-03-25 13:22:35 +01:00
Julian Nicolas Herrero
9cfd3c70be Merge pull request #3385 from consul/welcome_page_not_logged_in_user 
Require logged in user if navigate to /welcome
 2019-03-22 17:35:29 +01:00
Senén Rodero Rodríguez
9d9ad5003b Add given_order to related poll question answers forms 
Since given order is no longer being generated automatically we need
to add it to related forms and to strong parameters methods
 2019-03-21 14:51:17 +01:00
taitus
a1de5b2334 Display tag "new" on actions 
An author will see a "new" tag on each action or resource that has appeared on his dashboard since his last login.
Too add "new" tag on dashbord menu when there are new resources.
 2019-03-21 12:29:31 +01:00
Julian Herrero
4df9a1a1b4 Move HTML settings to content blocks settings page 
- Rename html settings keys
- Show html settings next to content blocks page
- Hide html settings from configuration tab
 2019-03-19 19:45:34 +01:00
Julian Herrero
c82b2a975a Add new settings tab for participation processes 
- Rename setting keys
- New tab por participation processes
- Hide these settings from features tab
 2019-03-19 19:45:32 +01:00
Julian Herrero
dbac4bc222 Change admin settings tab for maps 
- Rename map settings keys
- Add fields for latitude, longitude and zoom
- Add a callout message on how to enable map feature
 2019-03-19 18:14:57 +01:00
Julian Herrero
c0d2776e8d Refactor Admin settings tabs 
- Rename partial views for tabs.
- Extract tables settings to reuse across the tabs.
 2019-03-19 18:14:55 +01:00
Alberto
7b2258aeb0 Merge pull request #3263 from Platoniq/dashboard-recommended-actions-page 
Dashboard recommended actions page
 2019-03-19 16:21:28 +01:00
Alberto
093a8cdb10 Merge pull request #3261 from Platoniq/dashboard-poster-email-styles 
Dashboard poster email styles
 2019-03-19 16:21:20 +01:00
Alberto
501f6257bf Merge pull request #3260 from Platoniq/dashboard-actions-for-published-proposals 
Dashboard actions for published proposals
 2019-03-19 16:20:47 +01:00
Julian Herrero
511f0be287 Require logged in user if navigate to /welcome 2019-03-19 14:55:51 +01:00
Julian Nicolas Herrero
af55366e57 Merge pull request #3360 from consul/double_quotes_for_controllers 
Change single quotes to double quotes for controllers
 2019-03-19 12:13:07 +01:00
Julian Herrero
87be6f302c Add default site customization pages 
From now on these static pages:

`/privacy'
`/conditions'
`/accesibility'
`/help/faq'
`/welcome'

have been moved to the DB and can be modified easily by any
administrator in `/admin/site_customization/pages'
 2019-03-14 18:35:51 +01:00
Julian Herrero
d24376f6ad Use double quotes in controllers/ 2019-03-13 22:19:49 +01:00
Juanjo Bazán
26d1024cfc Add cumulative totals to admin poll recounts list 
This commit backports commit AyuntamientoMadrid@90638672 and the changes
that code has been through:

* AyuntamientoMadrid@03371a71 removed daily recounts in the controller
* AyuntamientoMadrid@fe3492a7 removed daily recounts in the view
* AyuntamientoMadrid@aa59d995 replaced FinalRecount with TotalResult
* AyuntamientoMadrid@c40e8d79 replaced TotalResult with Recount
 2019-03-07 02:09:17 +01:00