Commit Graph

3509 Commits

Author SHA1 Message Date
María Checa
15a07ad4eb Adds logic to show 'see results' button only for finished budgets 2018-07-26 14:31:42 +02:00
Alberto
db44dd1226 Merge pull request #2720 from wairbut-m2c/backport/moderation-index-positioning
Fix moderation index views information positioning
2018-07-26 14:18:11 +02:00
Alberto
b04b1bee46 Merge pull request #2801 from consul/proposal_authors_notifications
Prevent authors from receiving their own proposals notification emails
2018-07-26 14:12:14 +02:00
Alberto
d17b628426 Merge branch 'master' into backport-2588-fix_supports_filter 2018-07-26 13:44:20 +02:00
Alberto
52a2931fcb Merge pull request #2798 from consul/activity_fix
Adds logic to handle activity actionable attributes
2018-07-26 12:58:33 +02:00
María Checa
a62b5c1492 Removes author from Proposal#users_to_notify 2018-07-26 12:51:34 +02:00
Alberto
ad7166166c Merge pull request #2796 from consul/remove_see_results_button
Removes permissions for admins to access unfinished budget results
2018-07-26 12:16:26 +02:00
María Checa
22210c46d0 Adds logic to handle activity actionable attributes 2018-07-26 11:46:35 +02:00
Alberto
25feaafce5 Merge pull request #2794 from consul/fix_notifiable_delegation
Try if notifiable has notifiable methods
2018-07-26 11:33:23 +02:00
María Checa
2dd5fe22a8 Removes permissions for admins to access unfinished budget results 2018-07-26 11:07:19 +02:00
Bertocq
c0feabd71e Try if notifiable has notifiable methods
Why:

There are Notifications with associated `notifiables` that actually are
not anymore Notifiables (the class doesn't include the Notifiable
concern). So when Notification delegates certain "notifiable" methods
to them the is an error.

How:

Using `try` directly on the notifiable association to avoid the delegate
trap on those corner case scenarios.
2018-07-26 10:33:04 +02:00
María Checa
4d355f3531 Added year to showed creation date and ordered by date DESC
Backported from AyuntamientoMadrid/consul fork
2018-07-26 10:22:42 +02:00
Bertocq
ac9f85e208 Change Proposal Notification Digest link to anchor
On the proposal notification digest messages there was a link to each
notification. Instead we need that link to point towards the notifications
tab of the proposal.
2018-07-25 20:20:33 +02:00
Bertocq
eb0919d978 Add Preview Pending action to Admin System Emails
Some system emails need to be manually reviewed before being sent. This
new action allows admins to see a preview of all Pending to be sent
Proposal Notification Digest messages.
2018-07-25 20:20:33 +02:00
Bertocq
5c726e0949 Add Admin System Emails view & first system email
Admins need to be able to see what a particular System Email looks like
with dummy data.

Also adding the first system email to be managed: the proposal
notification digest.

In case the current admin doesn't have any Notifications from
 ProposalNotifications there will be a crash. We'll solve this in later
 PR's with a system to "inject" sample text in email templates without
 having to generate records in the database.
2018-07-25 20:20:33 +02:00
Bertocq
b9c6da245a Add System emails menu & list to admin panel
We need a section to list all System Emails to view the templates and
preview an example of what would be sent.
2018-07-25 20:19:58 +02:00
Bertocq
3fd97b0a9b Rename Newsletter & Notification to User Messages
We're increasing the features around messaging users, menu name has to
be generic enough.
2018-07-25 20:18:58 +02:00
Alberto
177eedf8e4 Merge pull request #2580 from consul/admin_notifications
Admin notifications
2018-07-25 20:05:19 +02:00
Alberto
7b8003dcb9 Merge pull request #2790 from wairbut-m2c/backport-1421-investments_csv_fixes
Add visible_to_valuators and author_username to admin investments CSV
2018-07-25 18:41:29 +02:00
Bertocq
f695a7faf3 Add AdminNotification management at admin panel
In the same fashion Newsletters is managed, with the only difference that
the preview is using the notification partial in the same way the index
of notifications.
2018-07-25 18:33:45 +02:00
Bertocq
a683fcff98 Refactor notification partials and index view
The notification body has been extracted to a new partial to allow
notifications without link to be rendered without needing an if-else
duplicating view code.

Note the `link_to_if` at _notification partial, as well as the optional
body attribute.
2018-07-25 18:31:41 +02:00
Marko Lovic
c991d9e7c7 Fix typo in i18n key 2018-07-25 17:28:14 +02:00
María Checa
e9d73eb687 Fix max_per_heading filter in Admin budget investments list
Also changed the name of the param to `min_total_supports`, which is more descriptive on what it actually does.

Backport of 75f20d5 and 07f0806 from AyuntamientoMadrid/consul fork
2018-07-25 15:44:51 +02:00
Marko Lovic
5413c34458 Restructure and rename translations
Based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
2018-07-25 15:10:09 +02:00
Alberto
61589122ef Merge pull request #2723 from wairbut-m2c/backport_2400_combine_free_text_search_and_filters
Combine text search and filters for Investments on Admin panel
2018-07-25 14:42:19 +02:00
Alberto
c63fd5ada1 Merge pull request #2776 from consul/ui-custom
UI custom
2018-07-23 11:39:19 +02:00
decabeza
dcec003d0e Updates header markup and includes new logo 2018-07-20 18:50:49 +02:00
Alberto
bc5d263a53 Merge pull request #2761 from wairbut-m2c/backport_1384-add-max-heading-number-budget-group-list
Backport 1384 add max heading number budget group list
2018-07-20 13:17:38 +02:00
Alberto
1f821a6540 Merge pull request #2714 from wairbut-m2c/fix/admin-menu-string-literal
Fix string literal warning for admin menu
2018-07-20 12:41:13 +02:00
Angel Perez
a143fa447b Ensure recommendations are only shown when enabled 2018-07-15 21:28:58 -04:00
Angel Perez
463c753880 Recommendations are automatically disabled if dismissed by user 2018-07-15 21:28:58 -04:00
Angel Perez
054bc1397b Wrap recommendations settings checkboxes with label helper to improve A11y 2018-07-15 21:28:58 -04:00
Angel Perez
251441e109 Users can now hide recommendations 2018-07-15 21:28:57 -04:00
Angel Perez
a58f6a2662 Enable 'Recommended proposals' setting for users 2018-07-15 21:28:57 -04:00
Angel Perez
522c206f6d Enable 'Recommended debates' setting for users 2018-07-15 21:28:57 -04:00
decabeza
bdb3f30e40 Adds recommendations on proposals index 2018-07-15 21:28:57 -04:00
decabeza
36a5ff39b8 Adds recommendations on debates index 2018-07-15 21:28:57 -04:00
decabeza
ecb0041b7f Adds recommended index partial and styles 2018-07-15 21:28:56 -04:00
Alberto
38916deb0b Merge pull request #2765 from consul/budgets-polls-ui
Polls UI
2018-07-13 20:01:40 +02:00
decabeza
bbaec57c8a Adds message in budget investment show if project is winner 2018-07-13 18:37:16 +02:00
decabeza
1116340f99 Removes participate in other polls button 2018-07-13 18:27:32 +02:00
iagirre
f871868a2b Max headings are updated when editing heading
The max headings label is updated automatically
when updating the heading. It is done via AJAX
and a refresh isn't needed.
2018-07-13 11:46:09 +02:00
Bertocq
1f0ee32998 Add max headings label on Group list 2018-07-13 11:46:09 +02:00
iagirre
0d9da5398b Fix banners in user pages
Banners were not been shown in certain pages; now
they are.

Spec to check if the banner is been shown correctly
added. Before it was in admins specs, now it has it's
own spec out of admins folder.
2018-07-12 10:17:25 -04:00
iagirre
82cb8d4c52 Changes suggested in PR:
* Delete all things related to banner images and styles (in code)
* Add a new test to check that the banner is showing correctly
* Update the specs accordingly to match the changes

Update dev_seed to set a random background_color and a font_color for banners (and remove everything about image and style)
Add a rake task to migrate the banner style to backgroun_color and font_color (so that the banners have the same colors than before)
2018-07-12 10:17:24 -04:00
iagirre
58caf167f6 Make color-pickers smaller 2018-07-12 10:16:47 -04:00
iagirre
3690cae458 Apply banner style to the new banners
Banner sections can be saved (one banner can appear in several sections)
If the hex color is changed in the textfield, the color of the color picker changes.
2018-07-12 10:16:47 -04:00
iagirre
6d6da8affc Add form fields to set the colours and the sections for the banner
Add migrations to store the information in the database
2018-07-12 10:16:47 -04:00
Raimond Garcia
a3a5971cbf Merge pull request #2696 from javierv/2573-fix_flaky_budgets_spec
Fix flaky spec: Admin budgets Manage groups and headings Create group
2018-07-12 16:04:06 +02:00
Alberto
c5c611837d Merge pull request #2732 from consul/legislation-help-gif
Legislation help gif
2018-07-11 17:44:12 +02:00