consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

1508 Commits

Author SHA1 Message Date
Bertocq
304b3941a7 Move current budget's geolocated investments code to helper function 2018-01-18 01:40:58 +01:00
BertoCQ
92eac29da7 Merge branch 'master' into budget_map 2018-01-18 00:36:43 +01:00
BertoCQ
01d7b86d42 Merge pull request #2331 from consul/current-budget-polish 
Add current_budget to management controllers
 2018-01-18 00:27:56 +01:00
Bertocq
a6b06ca730 Improve Budget's homepage 
* Add budget's phases number status
* Add budget's headings and groups list
* Placeholders for future improvements
 2018-01-17 19:11:58 +01:00
Vicente Mendoza
d0df965487 fix some issues about test and variables name 2018-01-17 17:10:19 +01:00
Vicente Mendoza
91e10e1897 new map on budget homepage 2018-01-17 13:15:35 +01:00
rgarcia
952df2947a Duplicate current_budget method in management_base_controller 
This method is already existent in the application_controller but it
seems a little overkill to create a concern just for this method

Maybe when we have multiple method it makes sense to create a nice
controller. Another option would be to make the
management_base_controller extend from the application_controller
 2018-01-17 12:50:17 +01:00
rgarcia
eca971a648 Use current_budget instead of Budget.current 2018-01-16 19:34:21 +01:00
BertoCQ
d44db9cec4 Merge branch 'master' into feature/budget_phases 2018-01-16 17:47:47 +01:00
Raimond Garcia
a215c9c603 Merge pull request #2322 from consul/current_budget 
Change concept of current budget to account for multiple budgets
 2018-01-16 16:53:10 +01:00
Bertocq
66691b644a Refactor Budget::PHASES constant to Budget::Phase::PHASE_KINDS 2018-01-16 12:18:13 +01:00
rgarcia
5086314bee Display only current budget for Valuators 
Before we could have multiple current budgets, as we now only have one
current_budget, some specs broke.

As there is no need to display multiple budgets to Valuators, only the
current budget is necessary, we can remove arrays and assume that only
a single budget, the current budget, is displayed to Valuators
 2018-01-15 22:02:04 +01:00
rgarcia
01ef439053 Display only current budget to Managers printing investments 
In the specs, some investment were missing a heading_id, thus creating
another unexpected budget

By explicitly setting the heading_id we can control better which
budgets are created in each test
 2018-01-15 22:02:04 +01:00
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