Commit Graph

1586 Commits

Author SHA1 Message Date
BertoCQ
3d5bf04829 Merge pull request #2311 from consul/2299-budget_investments_related_content
Budget investments related content
2018-01-15 20:02:34 +01:00
rgarcia
9176de949a Refactor concept of current budget
When there was only one budget this implementation worked fine

Nowadays there can be multiple budgets, and therefore the definition of
the current_budget has changed. It is no longer a budget that has not
finished, but rather, the last budget created that is not in the
initial drafting phase.

Budgets in the drafting phase are not considered the current_budget,
but rather a budget that is still being prepared and that soon will
become the current_budget
2018-01-15 19:13:37 +01:00
Bertocq
7179dbbba0 Remove deprecated on hold budget phase group, no longer used in code 2018-01-14 20:41:24 +01:00
María Checa
a1f840e8fd Added improvements to related contents 2018-01-12 18:35:15 +01:00
Raimond Garcia
b0bd7792be Merge pull request #1917 from wairbut-m2c/iagirre-admin-budget-heading-action
Actions for budgets' headings added. Edit headings, delete headings i…
2018-01-11 13:47:27 +01:00
iagirre
0e11e21b2a Merged with master and solved conflicts 2018-01-10 13:23:39 +01:00
Bertocq
334091710c Refactor price & explanation showing logic at Investment model 2018-01-10 11:26:16 +01:00
Bertocq
21d6ce57c5 Add published_prices? helper method and phases constant at Budget model 2018-01-10 01:15:07 +01:00
Bertocq
f3a7de55ea Rename should_show_price_info? to should_show_price_explanation? at Budget::Investment & usage 2018-01-10 01:13:34 +01:00
Bertocq
922318b978 Add publishing prices phase to budget model, plus translation texts 2018-01-10 01:10:57 +01:00
Bertocq
d8ceff1a53 Refactor Budget's on hold phases to constant, plus alignments 2018-01-10 01:09:13 +01:00
Raúl Fuentes
29018e3062 changes made at the request of voodoorai2000 2018-01-09 13:08:03 +01:00
Bertocq
f9803ce9ca Add drafting phase to budget model & translations 2018-01-08 22:56:11 +01:00
Bertocq
18236e8827 Fix random order seed value cleanup to allow negative values and always be numeric 2018-01-06 18:21:24 +01:00
Bertocq
b990384b0a Fix multiple attachment upload by setting the id, style and updated at date on hash 2018-01-03 17:38:44 +01:00
Bertocq
ce9d5ec022 Cleanup bad indentation on direct upload model 2018-01-03 17:38:44 +01:00
rgarcia
96066aee44 Validates map presence only on create
As we are using an attr_accessor to make sure a user accepts that the
proposal “has no map”, the validation was being run in every save.

Making other things break, for example the updating of the counter
cache `cached_votes_up`, when someone voted for the proposal, as the
attr_accessor `skip_map` was not present
2017-12-26 12:39:29 +01:00
BertoCQ
d534b02b3c Merge pull request #2206 from consul/related-contents-score
Related contents score
2017-12-20 15:13:12 +01:00
María Checa
1e23281c28 Fixed related content tests 2017-12-20 13:43:56 +01:00
rgarcia
7889efd6ee Fix map location update
When editing the map of a proposal or investment(the mappable) the
updated_at attribute of the mappable was not been updated and so the
map still displayed the old location after updating it
2017-12-20 12:43:49 +01:00
Bertocq
cf06d5b047 Refactor related content score methods to make them easier to follow 2017-12-20 10:24:00 +01:00
Bertocq
3eecabe9a8 Prevent authors or users that already scored from scoring related content 2017-12-20 03:06:41 +01:00
Bertocq
e6a5071160 Fix typo on RelatedContentScore attribute score to value 2017-12-20 02:36:14 +01:00
Bertocq
a72cc58b49 Fix Related Content Score presence validations and unique composed key 2017-12-20 02:36:14 +01:00
Bertocq
e19153a26e Fix typo on RelatedContentsScore call to RelatedContentScore 2017-12-20 02:36:14 +01:00
Bertocq
585eb36871 Hide related content when scoring goes under threshold 2017-12-20 02:36:13 +01:00
Bertocq
d544d56722 Add correct user to RelatedContentScore on creation 2017-12-20 02:36:13 +01:00
Bertocq
2e0dd9caea Relationable find_related_content should not be used to find, refactored to have a single purpose 2017-12-20 02:36:13 +01:00
Bertocq
2688f2a919 Add author user to related content 2017-12-20 02:36:13 +01:00
Bertocq
4d2d7c1a0a Add act as paranoid to related content, with not_hidden scope using hidden_at 2017-12-20 02:36:13 +01:00
Bertocq
f21f5ec05e Refactor Related Content Controller score methods 2017-12-20 02:36:13 +01:00
Bertocq
065b0ed3c8 Create Related Content Scores 2017-12-20 02:36:10 +01:00
rgarcia
19a084c0c7 adds map validations 2017-12-19 20:32:55 +01:00
María Checa
a8ca3ec5f7 Added related content one positive score by default on create 2017-12-19 20:15:29 +01:00
María Checa
7d8b5838b9 Added new related contents score method 2017-12-19 13:14:12 +01:00
María Checa
8d7509917c Prevent relationable models from being cached 2017-12-18 22:25:22 +01:00
decabeza
dfe077a30e renames times_reported to flags_count on relationable.rb 2017-12-18 20:13:29 +01:00
María Checa
97f74ac531 Renamed related content times_reported column to flags_count 2017-12-18 18:21:46 +01:00
BertoCQ
0bd025962b Merge pull request #2200 from wairbut-m2c/aperez-proposal-recommendations
New scopes for proposal recommendations
2017-12-16 19:58:46 +01:00
Bertocq
b02e2729e7 Rubocop style autocorrections 2017-12-16 17:59:16 +01:00
Angel Perez
63317714c3 Proposal recommendations won't include archived or already supported proposals 2017-12-15 22:40:24 -04:00
rgarcia
56945d9bbe allows querying for a proposal's votes 2017-12-15 19:21:02 +01:00
Bertocq
900d8a00b1 Make milestone's description a required attribute 2017-12-15 16:38:21 +01:00
Raimond Garcia
d0b407d4e5 Merge pull request #2183 from consul/related-content
Related contents functionalities
2017-12-15 10:00:43 +01:00
Raimond Garcia
9ba8ca7de3 Merge pull request #2187 from consul/notifications
Fix notifications' exceptions
2017-12-14 22:11:27 +01:00
Alberto García
1737f85398 Merge branch 'master' into aperez-dates-for-milestones 2017-12-14 20:50:55 +01:00
María Checa
88fc740863 Moved RELATIONABLE_MODELS from controller to model 2017-12-14 20:48:32 +01:00
rgarcia
2b52d26d82 refactors notifications into concerns and shared examples 2017-12-14 16:15:30 +01:00
iagirre
01a8c55936 Make Budget::Investment::Milestone class Documentable.
Add fields to the milestone form so that the admin can attach 0, 1 or multiple documents.
Add column to milestone list with a link to documents (if there is any).
Make documents accessible from the milestone view for users.
2017-12-14 10:53:01 +01:00
Angel Perez
6d57d76071 Admins can add a 'publication date' to milestones 2017-12-13 20:17:54 -04:00