Commit Graph

5295 Commits

Author SHA1 Message Date
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
Sergio Castellano Herrera
2905b24ee7 Error to access hide comments 2018-01-29 16:48:48 +01:00
Sergio Castellano Herrera
54753fece4 Error to access hide comments 2018-01-29 16:48:40 +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
Angel Perez
665a5b57ab Empty instances of MapLocation won't result in a new DB record (#2220) 2018-01-26 09:26:48 -04: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
iagirre
f2927c8eb2 Add alert to the delete button of 'My activity' section so that users don't delete their investmentes accidentally 2018-01-25 16:54:26 +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
Bertocq
31956312bf Make use of new single_heading_group? on existing similar logic 2018-01-24 12:17:46 +01:00
Bertocq
ce3bf20152 Add group name on heading options if more than one heading per group 2018-01-24 12:15:56 +01:00
Bertocq
9bb088a5c7 Add single_heading_group? helper at Budget::Group model 2018-01-24 12:15:43 +01:00
Bertocq
d75fd59684 Align right heading amount & population at admin table 2018-01-24 01:12:38 +01:00
Bertocq
43137df4a5 Format heading price at admin table 2018-01-24 01:12:17 +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
Bertocq
e59ed81528 Return 404 accesing community without communitable
Why:

Somehow we're seeing communities without proposals at production. We
must find why and fix it, but first we need to throw a 404 at the user
instead of a 500 internal server error

How:

First catching the scenario of non-existent communitable at the
controller and raising a 404 error. Secondly preventing the author_id
access over a possibly nil object, this is a smell but it can't be
easily fixed right now... we need to correctly implement a relation
between Community and communitable and avoid the multiple occurences of
`community.from_proposal?` in the codebase that makes it impossible to
extend to a fourth communitable model.
2018-01-23 00:22:53 +01:00
Bertocq
cc69225b7a Assert phases list order in admins budget edit form 2018-01-23 00:15:06 +01:00
Bertocq
217f62116e Correctly scape budget phase summary on phases list 2018-01-22 23:29:48 +01:00
decabeza
7a17db01ef adds links with filters on budgets results page 2018-01-22 19:27:54 +01:00
Angel Perez
3f6a9187ec Add 'current applied filters' message to investments partial 2018-01-22 14:04:57 -04:00