Commit Graph

566 Commits

Author SHA1 Message Date
Alberto
fb19aafee7 Merge pull request #2778 from wairbut-m2c/backport/investments-moderation
Allow budget investments to be moderated
2018-07-27 12:34:17 +02:00
María Checa
9d580e15f5 Adds activity tab for system emails 2018-07-26 17:55:06 +02:00
María Checa
eb8c021451 Adds button to send pending proposal notifications 2018-07-26 17:55:06 +02:00
Angel Perez
c240c57171 Add budget investment factory to fix failing scenario
Changes introduced in commits 41f66fa and dc87b75 will render the
'See results' button under `admin/budget_investments` only if a
finished budget has winner investments associated with it
2018-07-26 14:54:20 +02:00
María Checa
15a07ad4eb Adds logic to show 'see results' button only for finished budgets 2018-07-26 14:31:42 +02:00
Alberto
89f2f53e75 Merge pull request #2799 from wairbut-m2c/backport-2588-fix_supports_filter
Fix `max_per_heading` filter in Admin budget investments list
2018-07-26 14:11:03 +02:00
Alberto
f93b1e24fb Merge pull request #2797 from wairbut-m2c/fix-admin-budget-investments-spec
Fix order-dependent spec
2018-07-26 13:57:04 +02:00
Alberto
d17b628426 Merge branch 'master' into backport-2588-fix_supports_filter 2018-07-26 13:44:20 +02:00
Alberto
273781430c Merge pull request #2800 from wairbut-m2c/backport-2589-investments_supports_order_filter
Change admin budget investments list order by supports from less to more
2018-07-26 13:43:28 +02:00
María Checa
5dfefbbe2f Change admin budget investments list order by supports from less to more
Sorting by id is in descending order and by title ascending

Backported from AyuntamientoMadrid/consul
2018-07-26 12:24:53 +02:00
Marko Lovic
b816a5be00 Fix order-dependent specs
Due to how DB IDs are assigned with AUTO INCREMENT, tests
cannot assume that any specific ID will be available.
2018-07-26 11:25:51 +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
Alberto
177eedf8e4 Merge pull request #2580 from consul/admin_notifications
Admin notifications
2018-07-25 20:05:19 +02:00
decabeza
bbf3faa783 Fixes admin notifications specs 2018-07-25 19:12:48 +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
a10169bac0 Add specs for Admin AdminNotification management 2018-07-25 18:31:41 +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
601e3058d8 Add visible_to_valuators and author username to admin investments CSV
Backport based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
2018-07-25 15:10:56 +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
Marko Lovic
53a1ea8847 Fix spec 2018-07-25 14:15:37 +02:00
Angel Perez
018de5a9f9 Add specs for investments moderation 2018-07-20 18:42:34 -04: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
iagirre
89a3da1edf Specs modified to fit the new UI
Now, a page refresh isn't needed to see the
updated information because it is done via AJAX.
The spec has been updated to check that the
message is being correctly updated without the
refresh.
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
Angel Perez
306b6d8967 Fix failing admin/banners scenario 2018-07-12 10:17:25 -04: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
5ce08532cb Update PR with master
Rebase master branch so that this PR can
be updated with the latest changes.
Conflicts has been solved. dev_seeds
has been also adapted to the new format
(it all separated to be easier to manage).
Some specs has been updated to work with
selenium-webkit.
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
bf69a7bba7 Specs added to test the change of background and font color with color-picker and text-field 2018-07-12 10:16:47 -04:00
decabeza
f213768035 Removes duplicated spec 2018-07-05 18:14:22 +02:00
Raúl Fuentes
275f9ad812 Added new test to budget/investment/index, tested the combination between text search and any other option in the search form 2018-07-04 11:55:13 +02:00
Raúl Fuentes
ee19c2fef0 Fixed test for updated form 2018-07-04 11:55:13 +02:00
Raúl Fuentes
df899cde6e Fixed html, now it reflects the current search also added serach by name or id to the Budget::Invesment search function 2018-07-04 11:55:13 +02:00
Raúl Fuentes
4cd2f11723 Fixed test for the refactored form 2018-07-04 11:55:13 +02:00
iagirre
894c5d1eca Fix restore notifications from admins page
The restore feature was not working properly. When pushed, the button
was removing the notification from the admins panel, but it was not
restoring in the proposal.

I added an `after_restore` function (that I missed in the first PR)
so that the notification is unmarked as moderated.
2018-07-02 18:19:49 +02:00
iagirre
8dadb228f1 Add specs to test the prop. notifications hide action
Specs that test if the proposal notifications hide action works.
It also tests if the admin part works (mark as reviewed, ignore them, etc.)
2018-07-02 18:18:05 +02:00
decabeza
d683a6cd6b Adds styles to budget investment milestone status and fixes spec 2018-06-27 19:28:43 +02:00
María Checa
fb5b993920 Add Budget::Investment::Statuses tests 2018-06-27 18:34:02 +02:00
María Checa
e8e9fcd0da Add Budget::Investment::Statuses tests 2018-06-27 16:45:58 +02:00
decabeza
55097ac643 Updates specs for show to valuators checkbox 2018-06-08 18:59:53 +02:00
decabeza
43b75b8356 Updates texts on admin legislation specs 2018-06-08 18:49:19 +02:00
decabeza
20cf51c0bd Updates texts on specs 2018-06-08 18:30:51 +02:00
Alberto
f9940980b0 Merge pull request #2645 from wairbut-m2c/admin-form-improvements-backport
Admin form improvements
2018-06-07 17:44:38 +02:00
Alberto
a05f6ac61a Merge pull request #2641 from consul/homepage
Add customization of homepage from admin section
2018-06-01 19:18:44 +02:00
Alberto
ec58ada817 Merge pull request #2650 from aamarill/2586-split_admin_settings
Split admin settings
2018-06-01 19:18:14 +02:00
decabeza
ef57396f9d Fixes styles for admin homepage 2018-06-01 18:00:19 +02:00
rgarcia
b672a4550d Add option to configure feed items displayed in homepage 2018-05-29 19:58:04 +02:00