consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,779 Commits 1 Branch 0 Tags
bdbb32e82463fa4f9cf07621db6044a00fad7b92
Commit Graph

8779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertocq
bdbb32e824 Move newsletter User scope outside UserSegments 
Why:

UserSegments are not only used for Newsletters or Email downloads, but
also for internal Global Notifications. We don't want to have that scope
hardcoded inside UserSegments as users that have opted-out from the
newsletter should still be recipients of global notifications.

How:

Removing the scope from the UserSegments `all_users` method that acts as
base for all the other segments. Including that `newsletter` scope only
on the places that is relevant:
* When listing recipients for a newsletter
* When downloading a listing emails that can be newsletter recipients

Also updated relevant tests
 2018-02-21 11:45:38 +01:00
Alberto Calderón Queimadelos
eb4a446a9a Merge pull request #2466 from consul/2120-admin_emails_list 
Admin emails list download
 2018-02-21 11:44:17 +01:00
Bertocq
f873bff5c6 Fix admin menu controller name conditionals 2018-02-20 22:33:01 +01:00
rgarcia
7f30d0c620 Fix doble submit specs 
We have a custom implementation to avoid doble submissions which causes
some custom problems 😌

This commit should fix the following three specs
spec/features/comments/legislation_annotations_spec.rb:367
spec/features/comments/legislation_questions_spec.rb:333
spec/features/custom/probe_option_comments_spec.rb:298

One of the custom problems comes from ajax:success[1] not being
triggered, instead only ajax:complete seems to be triggered

We should remove this custom implementation and use the standard
solution provided in rails[2]

[1]
https://github.com/AyuntamientoMadrid/consul/blob/master/app/assets/java
scripts/prevent_double_submission.js.coffee#L28

[2]
https://stackoverflow.com/questions/9570912/how-to-disable-a-form-submit
-button-a-l%C3%A0-ruby-on-rails-way/9572893#9572893
 2018-02-20 22:33:01 +01:00
María Checa
752ffd678f Added download emails spec and renamed newsletters spec 2018-02-20 22:33:01 +01:00
María Checa
c78ae7e346 Added emails download translations 2018-02-20 22:33:01 +01:00
María Checa
1c458d4be3 Added emails download views 2018-02-20 22:33:01 +01:00
María Checa
6c36e17ce2 Added SEGMENTS variable to UserSegments class 2018-02-20 22:33:01 +01:00
María Checa
cb15a2e25b Added EmailsDownload controller and routes 
Removed original method to return emails file from Newsletters controller and NewsletterZip class, included `rubyzip` gem that's no longer necessary.
 2018-02-20 22:33:01 +01:00
Bertocq
1c653a7096 Improve admin menu active item conditionals 2018-02-20 18:50:39 +01:00
María Checa
880a07500e Updated changelog 2018-02-20 16:19:21 +01:00
María Checa
017c242085 Merge pull request #2462 from consul/admin-newsletter-emails 
Admin newsletter emails
 2018-02-20 16:17:37 +01:00
María Checa
fb165b5263 Updated changelog 2018-02-20 13:32:02 +01:00
Bertocq
1434449b84 Fix line length issues at User model 2018-02-19 11:09:19 +01:00
Bertocq
9925e2b02f Extract inline query to User scope & refactor 2018-02-19 11:09:19 +01:00
Bertocq
62d75af892 Fix line lenght offenses at multiple controllers 2018-02-19 11:09:19 +01:00
Bertocq
4fb9f6829c Extract inline query to an OfficerAssignment scope 2018-02-19 11:09:19 +01:00
Bertocq
118deb9fc4 Fix line lenght offenses at multiple controllers 2018-02-19 11:09:19 +01:00
Bertocq
fbfabaeda4 Fix typo at followable shared spec 2018-02-19 11:07:59 +01:00
Bertocq
34877ede57 Fix typos on english translations 
Thanks to @PierreMesure that noticed on each one while using Crowdin!
 2018-02-19 11:00:25 +01:00
Bertocq
44aeb7528d Fix line lenght issues on spec files 2018-02-15 23:21:03 +01:00
Bertocq
4e34a1cf41 Fix common actions file rubocop issues 2018-02-15 23:17:10 +01:00
Bertocq
2aca87b3ae Fix verifiable support spec line lenght issues 2018-02-15 23:05:47 +01:00
Alberto García
6dfa2ea4e9 Merge pull request #2465 from consul/minor-fixes 
Design minor fixes
 2018-02-15 18:04:07 +01:00
decabeza
9e51d47012 Fixes image height on items list with tags 2018-02-14 19:19:28 +01:00
decabeza
9c887f5ee9 Removes old unused css 2018-02-14 18:21:04 +01:00
decabeza
1cc799ef11 Adds links to milestone description 2018-02-14 18:13:46 +01:00
decabeza
a950bb03a7 Removes unnecessary p tag on investment partial 2018-02-14 18:04:17 +01:00
decabeza
990dc072be Refactors custom page view and include specs 2018-02-14 17:52:10 +01:00
decabeza
f7c7f0201a Fixes heading structure and i18n format on legislation processes 2018-02-14 17:06:26 +01:00
María Checa
24bca36639 Merge branch 'master' into admin-newsletter-emails 2018-02-14 16:07:13 +01:00
María Checa
20de8c81f7 Added newsletters to dev_seeds 2018-02-14 16:06:33 +01:00
María Checa
7b71aaded7 Updated schema 2018-02-14 16:06:33 +01:00
María Checa
e8c797766a Added newsletter specs 2018-02-14 16:06:33 +01:00
María Checa
14ce229c8c Added newsletter translations 2018-02-14 16:06:31 +01:00
María Checa
d786284ce9 Added newsletter custom stylesheets and js alert 2018-02-14 16:06:02 +01:00
María Checa
f1fbe7ff29 Modified administrator abilities for newsletters 2018-02-14 16:05:31 +01:00
María Checa
881059811f Added newsletter admin views 2018-02-14 16:05:29 +01:00
decabeza
c0c4d9e01f Fixes back link to on how to use help page 2018-02-14 16:00:01 +01:00
Raimond Garcia
8bec36500a Merge pull request #2385 from wairbut-m2c/2363-alert-delete-investment-project 
Add alert message when a user deletes an investment project from "My activity"
 2018-02-13 14:06:08 +01:00
María Checa
20173f9870 Added newsletter mailer method and view 2018-02-13 13:12:00 +01:00
María Checa
49adcfde02 Added newsletter controller and routes 2018-02-13 11:39:12 +01:00
María Checa
07f2419f8f Added newsletter model and UserSegments class 2018-02-13 11:39:10 +01:00
María Checa
a22faadc1f Added newsletter migration 2018-02-12 21:22:56 +01:00
Bertocq
d00be604b7 Update byebug version to 10.0.0 2018-02-11 23:37:56 +01:00
Bertocq
43559981eb Enable rubocop Layout/EndOfLine cop with LF 2018-02-11 10:33:51 +01:00
Bertocq
664db2306c Enable rubocop Rails cops without issues 2018-02-10 21:29:21 +01:00
Bertocq
3f91e920f6 Enable rubocop Performance/RedundantMatch cop & fix issues 
Some cop offenses have been stashed into rubocop_todo.yml for now
 2018-02-10 21:26:02 +01:00
Bertocq
57743df197 Enable rubocop Performance/HashEachMethods cop & fix issues 2018-02-10 21:22:47 +01:00
Bertocq
307fe18c59 Enable rubocop Performance cops without issues 2018-02-10 21:17:56 +01:00