Commit Graph

9098 Commits

Author SHA1 Message Date
depfu[bot]
11a235da4d Update nokogiri to version 1.8.2 2018-01-31 17:44:44 +00:00
Bertocq
bca150bcd5 Prevent non-authors from viewing valuation comments 2018-01-31 18:38:44 +01:00
Bertocq
fcf5e6223b Ensure graphql doesnt return valuation comments 2018-01-31 18:31:22 +01:00
Bertocq
c0dcd03bab Prevent valuation comments from appearing in public pages 2018-01-31 18:14:11 +01:00
Bertocq
5420cd36bf Disallow comment actions on valuation comments 2018-01-31 17:46:36 +01:00
Bertocq
0f4d0b4fe9 Improve valuation flag at comment form 2018-01-31 17:19:26 +01:00
Bertocq
d3d5b233c2 Increase admin investment feature spec for valuation comments feature 2018-01-31 17:08:08 +01:00
Bertocq
9cb4b03276 Disallow valuation comment creation on finished budget 2018-01-31 17:07:56 +01:00
Bertocq
b926740a32 Show valuation comments at admin investment show page 2018-01-31 16:35:45 +01:00
Bertocq
528c9be925 Refactor valuation comments into its own partial
It's going to be used at valuation and admin panels
2018-01-31 16:34:11 +01:00
Bertocq
a15e372f7e Rename written_by_authors partial to dossier
Its more descriptive in the contexts where its rendered
2018-01-31 16:30:39 +01:00
Bertocq
e38e74169e Improve valuation comments spec to avoid public leaks
Check that on both comment creation and comment reply the public facing
investment page doesn't show them
2018-01-31 16:27:07 +01:00
Raimond Garcia
b0eaece981 Merge pull request #2411 from wairbut-m2c/aperez-investments-search-by-id
Admins can search investments by title or ID
2018-01-31 15:44:19 +01:00
Angel Perez
47c9b343ee Admins can search investments by title or ID (#2401) 2018-01-31 09:52:55 -04:00
Raimond Garcia
45d07fa16f Merge pull request #2407 from wairbut-m2c/aperez-investment-filters-aggregation
Investments can be applied several filters at once
2018-01-31 14:39:02 +01:00
BertoCQ
06cd81fdbd Merge pull request #2404 from consul/remove_investments_internal_comments
Remove usage of Investment's internal_comments
2018-01-31 13:47:38 +01:00
BertoCQ
05a6406189 Merge branch 'master' into remove_investments_internal_comments 2018-01-31 13:47:15 +01:00
BertoCQ
ec81f399bf Merge pull request #2403 from consul/valuation_comments
Valuation comments
2018-01-31 13:46:22 +01:00
Angel Perez
137aa7e779 Add spec to test aggregation when filtering investments 2018-01-31 07:21:51 -04:00
Angel Perez
1f50e284a9 'Current applied filters' message handles multiple filters in use 2018-01-31 07:21:51 -04:00
Angel Perez
a5159672d4 Investments are now aggregated when using more than 1 advanced filter 2018-01-31 07:21:51 -04:00
Alberto García
0d64f51b78 Merge pull request #2405 from consul/more-info-pages
Improve texts of help page
2018-01-31 11:09:12 +01:00
BertoCQ
4020720b32 Merge pull request #2370 from consul/improve_budget_heading_style
Improve budget heading style
2018-01-31 02:35:51 +01:00
BertoCQ
f0f41b0403 Merge pull request #2373 from consul/single_heading_group_names
Improve heading names at select boxes
2018-01-31 02:35:11 +01:00
BertoCQ
c216e965cc Merge pull request #2371 from consul/change_default_locale_to_en
Make English the default locale
2018-01-31 02:33:28 +01:00
Bertocq
4ec30a9082 Avoid using comments_count counter_cache at Investment
As Budget::Investment has two relationships over commentable polymorphic
relationship, the counter_cache is counting the sum of both comments and
valuations.

We don't show valuations count anywhere, only the (public) comments so
we just use comments.count in this case
2018-01-31 02:05:37 +01:00
Bertocq
033c197580 Disallow comment flagging when showing valuations 2018-01-31 02:05:35 +01:00
Bertocq
a4718f6555 Add Budget Investment valuation comments feature spec 2018-01-31 02:04:17 +01:00
Bertocq
1c3924b527 Hide comment voting at valuation comment threads 2018-01-31 02:04:16 +01:00
Bertocq
26cf91c61a Create valuation comments creation ability
Why:

Only admins or valuators (for those investments they've assigned) can
create internal valuation comments on them.

How:

* Creating a new `comment_valuation` ability for admins and valuators in
the same manner the `valuate` ability works.

* Adding a validation at Comment model for those with `valuation` flag
active that checks if the author can make a valuation comment on the
commentable, as well as the respective active record error messages.
This will prevent comments from being created at a controller level as
well.

* Improving comment factory trait `valuation` to have an associated
investment, author that is a valuator and setting the valuator on the
valuators list of the investment
2018-01-31 02:03:03 +01:00
Bertocq
149c81371b Allow valuation internal comments to be created
How:

Using a local variable at partials to set a hidden true/false value for
`valuation` parameter on the comment creation form.

Allowing that new param at the comment controller and using it when
building a new Comment.
2018-01-31 02:03:02 +01:00
Bertocq
dff966d9b3 Show valuation comment thread @ Valuation show/edit
Why:

Budget Investment's valuators should be able to see internal valuation
comments thread at both show and edit views.

How:

At Valuation::BudgetInvestmentsController:
* Include CommentableActions to gain access to the entire feature, with
required resource_model & resource_name methods.
* Add the only possible order (oldest to newest)
* Load comments on both show & edit actions, passing `valuations` flag
to the CommentTree in order to only list those.

At CommentTree:
* Use `valuations` flag as instance variable to decide wich
comment threat to load: valuations (if relation exists) or comments.
2018-01-31 01:53:33 +01:00
Bertocq
679cf3943e Update Deprecated section of Unreleased at Changelog file 2018-01-31 01:11:18 +01:00
Bertocq
09aa5a17cf Add rake task to migrate investment's internal comments to thread 2018-01-31 01:11:15 +01:00
Bertocq
767fd04bdf Add valuation comments relation at Budget Investment
Why:

Budget Investments already has an existing `comments` relation that is
on use. We need to keep that relation unaltered after adding the
internal valuation comments, that means scoping the relation to only
public comments (non valuation ones) so existing code using it will
remain working as expected.

A new second relation will be needed to explicitly ask for valuation
comments only where needed, again scoping to valuation comments.

How:

Adding a second `valuations` relationship and filtering on both
with the new `valuation` flag from Comment model.
2018-01-30 19:22:27 +01:00
Bertocq
56fc5c9583 Filter internal valuation comments from public api
Why:

Internal valuation comments are only for admins and valuators,
not for the public view.

How:

Adding a `not_valuations` scope and use it at the `public_for_api` one
2018-01-30 19:22:27 +01:00
Bertocq
c84b2f0704 Add valuation boolean flag to Comment model
Why:

Budget Investment's valuators need to be able to comment on investments
without making those comments public. We need a way to clearly make a
distinction to avoid "leaking" internal valuation comments.

How:

Adding a boolean `valuation` attribute defaulted to false to the Comments
table, and index on it with concurrent algorithm as explained at
https://robots.thoughtbot.com/how-to-create-postgres-indexes-concurrently-in

The name `valuation` was chosen instead of `internal` because of the more
specific meaning as well as avoiding a collision with existing internal_comments
attribute on Budget::Investment model (soon to be deprecated & removed)
2018-01-30 19:22:27 +01:00
BertoCQ
e0e67c959b Merge pull request #2397 from consul/hide_order_selector_if_only_one_order
Hide order selectors when only one order available
2018-01-30 19:20:28 +01:00
decabeza
42d0f471ee Updates i18n keys and images folder 2018-01-30 19:10:48 +01:00
decabeza
fc89c899cc Updates help url example on seeds 2018-01-30 18:28:05 +01:00
decabeza
f92664331d Changes .more-information class to .help 2018-01-30 18:27:43 +01:00
decabeza
286371c9d9 Changes more_info folder and path to help 2018-01-30 18:26:30 +01:00
decabeza
a958a75bb1 Updates text of polls section of more info page 2018-01-30 18:13:24 +01:00
decabeza
037a3af5a6 Updates text of budgets section of more info page 2018-01-30 18:12:48 +01:00
decabeza
fffc769c90 Updates text of proposals section of more info page 2018-01-30 18:12:21 +01:00
decabeza
59a02301c2 Updates text of debates section of more info page 2018-01-30 18:11:50 +01:00
decabeza
735630cff0 Updates text of intro section of more info page 2018-01-30 18:11:13 +01:00
decabeza
213152349b Changes more info link to help 2018-01-30 18:10:42 +01:00
Bertocq
e5ce55b1cd Hide order selectors when only one order available 2018-01-30 17:03:17 +01:00
Raimond Garcia
e1b7c7aa32 Merge pull request #2398 from wairbut-m2c/aperez-fix-investments-table
Fix: Admin investments table not showing up properly
2018-01-30 12:18:47 +01:00