Commit Graph

2545 Commits

Author SHA1 Message Date
rgarcia
349780922d Add Budget.open scope
Before Budget.current could return multiple budgets, now there can only
be a single current_budget.

Adding the concept of open, which better reflects what the admin sees
in this page: A tab for open budgets and a tab for finished budgets
2018-01-15 22:01:59 +01:00
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
be554a629c Make current_budget accessible in controller and views 2018-01-15 19:13:45 +01:00
María Checa
a1f840e8fd Added improvements to related contents 2018-01-12 18:35:15 +01:00
María Checa
c56a7b4e16 Added related contents to budget investments 2018-01-11 16:49:07 +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
Bertocq
3026115382 Remove redundant curly braces around a hash parameter 2018-01-10 22:44:11 +01:00
iagirre
0e11e21b2a Merged with master and solved conflicts 2018-01-10 13:23:39 +01:00
iagirre
f0724ce13a Changes suggested in the PR made 2018-01-10 13:13:05 +01:00
Raúl Fuentes
29018e3062 changes made at the request of voodoorai2000 2018-01-09 13:08:03 +01:00
Raúl Fuentes
b3461b2051 final details 2018-01-09 12:45:30 +01:00
Raúl Fuentes
56f4c3c3b9 added test to csv download and style corrections 2018-01-09 12:45:30 +01:00
Raúl Fuentes
95c1aa43e8 added csv download link to budget_investments (issue 1625) 2018-01-09 12:45:30 +01:00
María Checa
96859190be Merge pull request #2280 from consul/2277-budgets_new_form
Budgets new form
2018-01-09 11:55:10 +01:00
BertoCQ
6e96c8c057 Merge branch 'master' into feature/2275#destroy_budgets 2018-01-09 11:03:51 +01:00
BertoCQ
01c41c7cca Merge pull request #2284 from consul/feature/2276#admin_budget_edit_redirect
Redirect admin to budget lists after edit
2018-01-09 10:50:54 +01:00
María Checa
5161988844 Removed external_url input 2018-01-08 23:22:46 +01:00
Bertocq
76e05d58b1 Return 404 status for non-published Budget access
Why:

Non-admin users shouldn't be able to access, or know of the existence
of a non-published Budget.

How:

Raising an ActionController::RoutingError (404 error) to simulate the
same behaviour as accesing a non-existing Budget.

We could have used CanCanCan abilities for this but then an user could
be aware of existing but not published Budgets by trying different urls
2018-01-08 22:59:20 +01:00
Bertocq
03e1481fb1 Redirect admin to budget lists after editing a budget 2018-01-08 18:47:09 +01:00
Bertocq
799b96cc40 Add destroy action to admin budget controller 2018-01-08 18:21:45 +01:00
Bertocq
327817ff36 Update version on install controller (late) 2018-01-03 21:07:19 +01:00
BertoCQ
d534b02b3c Merge pull request #2206 from consul/related-contents-score
Related contents score
2017-12-20 15:13:12 +01:00
Bertocq
01d5656884 Fix valid related content url helper method 2017-12-20 14:51:39 +01:00
Bertocq
cf06d5b047 Refactor related content score methods to make them easier to follow 2017-12-20 10:24:00 +01:00
Bertocq
c67851df53 Fix relatedcontent creation and scoring on related content controller 2017-12-20 03:06:06 +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
f21f5ec05e Refactor Related Content Controller score methods 2017-12-20 02:36:13 +01:00
rgarcia
19a084c0c7 adds map validations 2017-12-19 20:32:55 +01:00
María Checa
7d8b5838b9 Added new related contents score method 2017-12-19 13:14:12 +01:00
María Checa
3836b73482 Added related contents to debates 2017-12-18 23:56:32 +01:00
María Checa
d944a88c63 Added flag/unflag related content routes 2017-12-18 18:21:51 +01:00
Bertocq
b02e2729e7 Rubocop style autocorrections 2017-12-16 17:59:16 +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
cd89cb801c Merge pull request #2190 from consul/related-content-form
Related content form
2017-12-15 09:59:56 +01:00
rgarcia
ebb3c075b0 fixes proposal's management specs 2017-12-15 09:58:12 +01:00
Alberto García
b4782f73f2 delete unnecessary parenthesis 2017-12-14 21:13:46 +01:00
María Checa
1830a7bb04 Added pagination for relationed content list 2017-12-14 20:54:35 +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
María Checa
5c7b5eed53 Added RelatedContentsController 2017-12-14 14:50:47 +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
iagirre
35986ea6b5 Budget::Investment::Milestone is imageable
Admin form attaches an image
Milestone list has a column "Image", empty or with a link to the image
2017-12-13 08:59:36 +01:00
Raimond Garcia
11e80fbc92 Merge pull request #1903 from wairbut-m2c/aperez-enable-disable-proposals
Add enable/disable option for 'Proposals' feature
2017-12-08 11:41:13 +01:00
Raimond Garcia
22a8157165 Merge branch 'master' into aperez-email-specs-for-commentables 2017-12-07 13:05:25 +01:00
Bertocq
7339a98b74 Create installation controller with consul details method, add route on routes.rb 2017-12-04 18:32:04 +01:00
Bertocq
05a6c35b65 Switch case statement for if 2017-12-04 15:48:09 +01:00
Bertocq
b327420e72 Force setseed value range from -1 o 1 2017-12-04 15:42:59 +01:00
María Checa
f9e65b0f80 Merge pull request #2102 from wairbut-m2c/iagirre-admin-poll-stats
Iagirre admin poll stats
2017-11-29 20:07:53 +01:00