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

756 Commits

Author SHA1 Message Date
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
Vicente Mendoza
ff5112f96b Changed the budgets helper so just search for the current budget 2018-01-26 11:30:02 +01:00
decabeza
1d7352d21c fixes textarea and label order on admin budgets phases form 2018-01-25 14:40:04 +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
acfd49e5bd improves styles for budget investments advanced filters 2018-01-25 11:14:06 +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
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
cc69225b7a Assert phases list order in admins budget edit form 2018-01-23 00:15:06 +01:00
Angel Perez
3f6a9187ec Add 'current applied filters' message to investments partial 2018-01-22 14:04:57 -04:00
Angel Perez
3826f040c2 Add missing 'tbody' HTML tag to investments partial 2018-01-22 14:02:29 -04:00
Angel Perez
e5c73d8f02 Add advanced filters for Admin::Budget::Investment 2018-01-22 14:02:29 -04:00
Bertocq
8eaf0982b1 Fixed Admin Budget's destroy button to a link 
Why:

The Admin Budget form has a submit button for saving the record, adding
another submit input to destroy the record actually adds to the html:
`<input type="hidden" name="_method" value="delete">` and it collides
with the save button, forcing it to perform a destroy instead of save.

Previously the destroy button was not in the same div as the save button

How:
Just changing the Destroy from a button_to to a link_to.
 2018-01-20 14:03:14 +01:00
María Checa
a97c007150 Added admin budget phases views 2018-01-19 18:19:46 +01:00
BertoCQ
d44db9cec4 Merge branch 'master' into feature/budget_phases 2018-01-16 17:47:47 +01:00
decabeza
0114286e6c adds class to improve table on mobile version 2018-01-16 12:37:03 +01:00
Bertocq
66691b644a Refactor Budget::PHASES constant to Budget::Phase::PHASE_KINDS 2018-01-16 12:18:13 +01:00
Bertocq
f2228a908b Refactor budget's phase max description lenght from Budget to Phase model 2018-01-16 12:18:13 +01:00
decabeza
ba63a91ce7 removes comments 2018-01-11 17:09:54 +01:00
decabeza
a39f5eb691 adds help text for population field on new heading form 2018-01-11 17:08:39 +01:00
decabeza
ddcd5eb2e0 Merge branch 'budgets-ui' of https://github.com/consul/consul into budgets-ui 2018-01-11 17:07:11 +01:00
decabeza
40d32f3e16 Merge branch 'master' into budgets-ui 2018-01-11 17:05:28 +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
decabeza
e819da5556 improve i18n for budgets notices 2018-01-10 22:27:22 +01:00
decabeza
46666c4b01 add i18n and fix layout for download current selection 2018-01-10 22:27:21 +01:00
decabeza
baeef5e1e8 fixes typo 2018-01-10 22:25:41 +01:00
decabeza
8dd41325be hide budget investment table heading if no results 2018-01-10 22:25:09 +01:00
decabeza
6f922621a9 adds help text for population field on admin budgets groups 2018-01-10 22:17:26 +01:00
decabeza
b8b3ce87f3 fixes label name of group on admin budgets groups 2018-01-10 22:17:25 +01:00
Bertocq
88741b9179 Improve investment links at budget list with target blank 2018-01-10 22:09:06 +01:00
Bertocq
760b7ca4c8 Fix indentations and lines lenght 2018-01-10 14:17:48 +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
María Checa
bc363289ad Added translations to link text 2018-01-10 12:19:48 +01:00
María Checa
eda673a85d Restored missing code 2018-01-10 11:57:13 +01:00
decabeza
27c4abf552 improve i18n for budgets notices 2018-01-10 11:37:05 +01:00
decabeza
13ea6bdd6b add i18n and fix layout for download current selection 2018-01-09 19:39:51 +01:00
decabeza
952869b5b6 fixes typo 2018-01-09 19:32:40 +01:00
decabeza
271c6869cd hide budget investment table heading if no results 2018-01-09 19:32:40 +01:00
decabeza
979d9d071b adds help text for population field on admin budgets groups 2018-01-09 19:29:36 +01:00
decabeza
bba19d1fd5 fixes label name of group on admin budgets groups 2018-01-09 19:29:36 +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
95c1aa43e8 added csv download link to budget_investments (issue 1625) 2018-01-09 12:45:30 +01:00
María Checa
c27e6ab1d1 Merge pull request #2223 from wairbut-m2c/iagirre-prevent-edition-if-budget-final-phase 
Prevent edition of investments if budget is in the final phase
 2018-01-09 12:18:23 +01:00
Bertocq
dd3a0add2a Add destroy budget button to admin budget edit view 2018-01-08 17:48:46 +01:00