Commit Graph

5200 Commits

Author SHA1 Message Date
Bertocq
033c197580 Disallow comment flagging when showing valuations 2018-01-31 02:05:35 +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
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
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
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
Bertocq
093b191f16 Small rubocop autocorrections 2018-01-30 03:07:52 +01:00
BertoCQ
dab1562132 Merge pull request #2369 from consul/fix_finished_budgets_list
Correctly show finished budgets at budget index
2018-01-30 02:25:06 +01:00
Angel Perez
2cee29d883 Fix: Admin investments table not showing up properly 2018-01-29 18:34:15 -04:00
Raimond Garcia
b5cb5e2563 Merge pull request #2387 from wairbut-m2c/show_only_current_budget_tags_in_admin_budget
Show only current budget tags in admin budget
2018-01-29 20:14:10 +01:00
Raimond Garcia
626b9972d1 Merge pull request #2378 from wairbut-m2c/aperez-investments-search
Add search & sorting options to Admin::BudgetInvestments
2018-01-29 20:06:43 +01:00
Alberto García
1207b5ce51 Merge pull request #2279 from wairbut-m2c/aperez-missing-i18n-keys
I18n maintenance
2018-01-29 14:02:15 +01:00
Bertocq
6d3359dbbc Fix bad line break 2018-01-26 12:01:22 +01:00
Vicente Mendoza
ff5112f96b Changed the budgets helper so just search for the current budget 2018-01-26 11:30:02 +01:00
Bertocq
5e583d2015 Increase notifiable access security on add notification method 2018-01-26 11:24:13 +01:00
Bertocq
f4ad0b2979 Improve add_notification logic to add notificable author 2018-01-26 00:33:07 +01:00
Bertocq
070c94494e Fix linelenght over 100 on multiple files 2018-01-26 00:27:03 +01:00
Bertocq
34b2a27357 Cleanup indentation and line lenght aat order select partial 2018-01-25 18:06:36 +01:00
Bertocq
9b2aebc8c2 Remove closing </li>'s without opening <li> 2018-01-25 17:54:15 +01:00
decabeza
1d7352d21c fixes textarea and label order on admin budgets phases form 2018-01-25 14:40:04 +01:00
decabeza
f607075c4a replaces hardcoded text to votes_for_proposal_success setting 2018-01-25 14:39:13 +01:00
Angel Perez
716fd6a46e Persist sorting when filtering/selecting investments 2018-01-25 08:18:04 -04:00
Angel Perez
e04dc5b8f2 Add sorting options for Admin::BudgetInvestments (#2336) 2018-01-25 08:18:04 -04:00
Angel Perez
d30d2b0dd8 Arrange Admin::BudgetInvestments I18n for buttons under same namespace 2018-01-25 08:18:04 -04:00
Angel Perez
680ca46ef1 Add search form for Admin::BudgetInvestments (#2336) 2018-01-25 08:16:32 -04:00
decabeza
c2ff1f6cff fixes scss lint warning 2018-01-25 11:14:06 +01:00
decabeza
acfd49e5bd improves styles for budget investments advanced filters 2018-01-25 11:14:06 +01:00
Bertocq
c01c08a3f4 Use current_budget directly instead of instance variable 2018-01-25 00:48:52 +01:00
Bertocq
8749b46ec4 Remove budget_published? usage on budget index, drafting budgets no longer listed 2018-01-25 00:48:52 +01:00
Bertocq
791f081a91 Rename @budget to @current budget at budget index
Clear instance variable names help understand what's going around when
you're deep 2 or 3 partials. In this case @budget is only used to carry
around the current_budget so @current_budget is more descriptive.

Using `current_budget` directly around would be an alternative, but
maybe not as maintainable in case we want to change which budget is
being shown (for example the drafting one if you're admin).
2018-01-25 00:48:52 +01:00
Bertocq
e62ca48a94 Show only finished budgets at budget's index
We only need finished budget's at budget's index "Finished budgets"
section. So we add the `finished` scope to @budgets variable, and rename
it so its clear what it contains.

Also avoid showing the "Finished budgets" section if there is none
2018-01-25 00:48:52 +01:00
Bertocq
6dcd01366c Preven admins from destroying others images&docs 2018-01-24 17:07:13 +01:00
Bertocq
97ec551178 Correctly check if user can destroy a document 2018-01-24 17:07:05 +01:00
María Checa
1c2949b60d Merge pull request #2344 from wairbut-m2c/aperez-investments-filters
Improvements for Admin::Budget::Investment filters
2018-01-23 20:09:54 +01:00
María Checa
0dd71e6bea Merge pull request #2349 from wairbut-m2c/iagirre-budgets-new-information-phase
Budget new "Information" phase
2018-01-23 19:46:49 +01:00
rgarcia
eee19ad690 Use scope to order headings by name 2018-01-23 19:35:42 +01:00
Bertocq
418dc6a1d6 Revert default map change 2018-01-23 17:30:42 +01:00
Alberto García
610e37870c Merge pull request #2367 from consul/budget-headings-order
Budgets groups headings order
2018-01-23 16:49:32 +01:00
Bertocq
c30c47cbb5 Improve default city map with 4 districts, and more real fake geozones 2018-01-23 15:59:24 +01:00
Raúl Fuentes
82b750de68 moved duplicated code to helper 2018-01-23 15:42:01 +01:00
iagirre
846898f3ec New phase "Information" added and UI modified to not show the links.
Specs to test the functionality added.
2018-01-23 15:42:01 +01:00
decabeza
cb170766b4 orders budgets groups headings by name 2018-01-23 13:55:42 +01:00
Bertocq
b6cc816d0f Remove the end date adjustment at admin budget phase table 2018-01-23 02:13:11 +01:00
Bertocq
599442440b Correctly format Budget's phases dates 2018-01-23 02:07:49 +01:00
Bertocq
d017b5bb49 Make Budget::Phase#invalid_dates_range? private 2018-01-23 00:23:22 +01:00
Bertocq
16b6abe2b8 Touch Budget object after updating a Budget::Pphase
Why:

We need to clear associated rails cache keys in order for changes to be
ready to be seen on the views

How:

* Just an after_save callback to a private method
2018-01-23 00:23:19 +01:00