consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,847 Commits 1 Branch 0 Tags
3e6b87df04821abf66a42bbe00a96084b2c9a68b
Commit Graph

9847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raimond Garcia
3e6b87df04 Merge pull request #2906 from consul/dependabot/bundler/i18n-tasks-0.9.25 
Bump i18n-tasks from 0.9.20 to 0.9.25
 2018-10-05 18:23:19 +02:00
Raimond Garcia
6a769d9484 Merge pull request #2926 from consul/dependabot/bundler/rubocop-rspec-1.26.0 
Bump rubocop-rspec from 1.24.0 to 1.26.0
 2018-10-05 18:22:33 +02:00
Raimond Garcia
4084b1c59f Merge pull request #2927 from consul/dependabot/bundler/delayed_job_active_record-4.1.3 
Bump delayed_job_active_record from 4.1.2 to 4.1.3
 2018-10-05 18:22:09 +02:00
Raimond Garcia
64997329fe Merge pull request #2928 from consul/dependabot/bundler/browser-2.5.3 
Bump browser from 2.5.2 to 2.5.3
 2018-10-05 18:21:42 +02:00
Raimond Garcia
3fc9e52099 Merge pull request #2929 from consul/dependabot/bundler/jquery-rails-4.3.3 
Bump jquery-rails from 4.3.1 to 4.3.3
 2018-10-05 18:21:23 +02:00
Javier Martín
e4f99681f8 Merge pull request #2950 from consul/backport-improve_index_legislation_proposals 
Allow select winner legislation proposals
 2018-10-05 12:59:28 +02:00
Raimond Garcia
f68dc2e1a9 Merge pull request #2936 from consul/i18n-pluralize 
Avoid InvalidPluralizationData exception when missing translations
 2018-10-05 12:57:48 +02:00
Javier Martín
68709e6353 Merge pull request #2952 from consul/backport-update_custom_pages_translations 
Update custom pages translations
 2018-10-05 12:57:06 +02:00
voodoorai2000
be80973e44 Avoid InvalidPluralizationData exception when missing translations 
We work with many languages using Crowdin[1]

Sometimes translators forget to fill in all the necessary plural forms of a translation (zero, one, other) and in those cases we were seing the exception InvalidPluralizationData being raised

There are a number of approches to fix this... from being more strict when approving translations, to automatically extrapolating what those plural forms should be

For now, we've gone for a simple approach to display the actual count(0,1,2,3,4, etc) instead of the whole translation

So, if the plural form of "1 comment" is missing, just a "1" will be displayed and no exceptions raised

Note: The first two specs, test what is really Rails' functionalities. However as we are monkey patching the pluralize method, I thought it was appropriate to doble check it

[1]https://crowdin.com/project/consul
 2018-10-05 12:26:07 +02:00
Javi Martín
d03cc2dc95 Update Spanish locales 
Just like done with English locales when updating translatable custom
pages in commit 351ef99.
 2018-10-05 12:21:47 +02:00
Javi Martín
ea7d4e0996 Remove trailing whitespace 2018-10-05 12:21:37 +02:00
decabeza
0d8c9c289a Removes closed message on legislation proposals votes 2018-10-04 16:32:32 +02:00
Javi Martín
0945f046a3 Avoid using xpath in specs 
Using xpath is usually harder to read and more fragile.
 2018-10-04 16:31:00 +02:00
Javi Martín
959270b0bb Separate setup, actions and expections in specs 2018-10-04 16:31:00 +02:00
Javi Martín
4c84a3a854 Move logic from view to helper 2018-10-04 16:31:00 +02:00
Javi Martín
9c13f08c8e Show selected legislation proposals by default 2018-10-04 16:31:00 +02:00
Javi Martín
2a5a2e0fcb Use "Random" instead of "All" in proposals filters 
That way users might be less surprised when they see proposals are
different each time they access the page.
 2018-10-04 16:31:00 +02:00
Javi Martín
8976280493 Order selected proposals by confidence score 
The same way we order budget results.
 2018-10-04 16:31:00 +02:00
Javi Martín
d9410a132a Always show filters for legislation proposals 
As done in the rest of the application: we show the filters even if
there isn't any data to display.
 2018-10-04 16:31:00 +02:00
Javi Martín
2fb5fb5fb2 Add missing newline characters 2018-10-04 16:31:00 +02:00
Javi Martín
ec2b4fe7ff Use %w[] instead of %w{} 
As agreed when discussing our rubocop rules.
 2018-10-04 16:30:59 +02:00
Javi Martín
81871a56f8 Simplify legislation process specs 
We kill two birds with one stone and also make each line less than 100
characters long.
 2018-10-04 16:30:59 +02:00
Javi Martín
66fc49f9ed Ignore dynamically used I18n keys 2018-10-04 16:30:59 +02:00
Javi Martín
659a45af0a Seed some selected legislation proposals 2018-10-04 16:30:55 +02:00
Javi Martín
d6ff7e0f3f Simplify code 2018-10-04 16:29:01 +02:00
Javi Martín
7d69f2aaab Properly test order by ID 
By default records are already ordered by ID, so we weren't checking the
ordering by ID functionality was working properly.

Making the records be ordered by title first makes the test a bit more
reliable.
 2018-10-04 16:29:01 +02:00
Javi Martín
dc9cf5da55 Order by supports in descending order 
Just as we do with confidence score, and as admins expect when they
order by received supports: the ones with more supports appear first.
 2018-10-04 16:29:01 +02:00
Javi Martín
f1745f8040 Fix typo 2018-10-04 16:29:01 +02:00
Javi Martín
75d1ab1e52 Use AJAX requests to select legislation proposals 
Now the interface is more similar to the one in budget investments.
 2018-10-04 16:29:01 +02:00
Javi Martín
667c2c82b5 Use toggle_select action for legislation proposals 
The `update` action is usually expected to behave the same way it does
everywhere else, which is updating a record using the `params` hash.

The name `toggle_select` comes from the name we use in a similar
situation for budget investments.
 2018-10-04 16:29:01 +02:00
Javi Martín
806b1fb3ca Extract select proposal button into a partial 2018-10-04 16:29:01 +02:00
Javi Martín
9df201780d Extract proposals table into a partial 2018-10-04 16:29:01 +02:00
Raúl Fuentes
a859de5d16 Test the selectable proposals 2018-10-04 16:29:01 +02:00
Raúl Fuentes
05340e423c Add select to Legislation::Proposals 
Add admin interface for mark any proposal as selected
Add filter to public interface for selected proposals
 2018-10-04 16:28:56 +02:00
Javier Martín
429fbc5ed5 Merge pull request #2948 from consul/backport-legislation-proposal-categories 
Add legislation proposal's categories
 2018-10-04 16:22:21 +02:00
voodoorai2000
422f3a5f47 Add tag filtering for legislation proposals 2018-10-04 15:43:41 +02:00
Javier Martín
c7a21e546d Merge pull request #2946 from consul/backport-customize_proposals_view 
Simplify legislation proposals customization
 2018-10-04 13:01:48 +02:00
Javi Martín
acbf20c938 Extract partial for proposals content 2018-10-03 22:07:55 +02:00
Javi Martín
f93281fd02 Extract link text to a helper 
This way we can use the same code in custom views which won't use the
same text.
 2018-10-03 22:06:20 +02:00
Javi Martín
ec18743251 Authorize resource after authenticating user 
Just like it's done everywhere else in the application. Not doing so
means users who aren't logged in receive a "you aren't authorized"
message when they try to create a new legislation proposal instead of
being redirected to the login page.
 2018-10-03 22:06:20 +02:00
Javi Martín
8064b53aad Add variety to legislation process dev seeds 
This way different processes will be in different phases and it will be
easier to test the application locally.
 2018-10-03 22:06:19 +02:00
Javi Martín
5ab8587ad2 Use absolute translation paths 
Using `t(.empty_proposals)` IMHO is a bit dangerous because we'd need to
change the locale files if we move the code to a partial or rename the
file.
 2018-10-03 22:05:33 +02:00
Javier Martín
5c1d1882ab Merge pull request #2945 from consul/backport-legislation_proposals 
Add admin permissions in legislation proposals
 2018-10-03 21:44:35 +02:00
María Checa
388c1a9bd9 Improved tests 2018-10-03 16:02:41 +02:00
María Checa
d73be15296 Added tests 2018-10-03 16:02:41 +02:00
María Checa
056086e81e Allow admins to see legislation debates and proposals index 2018-10-03 16:02:12 +02:00
María Checa
6d5e1a075e Allow admins to access Legislation::Proposal #show and Legislation::Process #proposals 2018-10-03 16:01:18 +02:00
Javier Martín
127eef3856 Merge pull request #2942 from consul/backport-feature/random_legislation_proposal 
Random legislation proposal's order & pagination
 2018-10-03 15:59:21 +02:00
Bertocq
df3df71a54 Force postgresql setseed value in correct range 
This commit partially backports commit AyuntamientoMadrid@f038399 by
taking only the parts affecting code already in CONSUL's main
repository.
 2018-10-03 13:46:32 +02:00
Bertocq
c04b0ceda4 Add pagination to legislation process proposals list 2018-10-03 13:46:32 +02:00