decabeza
40d32f3e16
Merge branch 'master' into budgets-ui
2018-01-11 17:05:28 +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
decabeza
27c4abf552
improve i18n for budgets notices
2018-01-10 11:37:05 +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
Bertocq
dd3a0add2a
Add destroy budget button to admin budget edit view
2018-01-08 17:48:46 +01:00
iagirre
bfcbb6c0ad
Validation in model and in form added. When users makes the on focus on population field an explanation appears. Some specs added to test the model validations
2017-10-31 13:04:30 +01:00
iagirre
f7e96067b0
Actions for budgets' headings added. Edit headings, delete headings if not budget investments associated and add link in order to see budgets investments filtered by the heading.
...
Cambios para hacer commit:
modificado: app/controllers/admin/budget_headings_controller.rb
modificado: app/models/budget/heading.rb
nuevo archivo: app/views/admin/budget_headings/_errors.html.erb
nuevo archivo: app/views/admin/budget_headings/edit.js.erb
nuevo archivo: app/views/admin/budget_headings/update.js.erb
modificado: app/views/admin/budgets/_group.html.erb
nuevo archivo: app/views/admin/budgets/_heading.html.erb
nuevo archivo: app/views/admin/budgets/_heading_form.html.erb
modificado: config/locales/en/activerecord.yml
modificado: config/locales/es/activerecord.yml
modificado: spec/features/admin/budgets_spec.rb
modificado: spec/models/budget/heading_spec.rb
2017-09-25 15:40:17 +02:00
taitus
43c17c3fc7
Add communities and topics
2017-09-05 12:51:08 +02:00
Bertocq
57f476c2fa
Merge branch 'master' into feature/add_population_to_budget_heading
2017-06-27 18:43:24 +02:00
Bertocq
d77355de0d
Add population field to admin Budget Heading form and headings list table
2017-06-25 15:47:46 +02:00
Bertocq
57ba414a34
Add button on Admin Budget edit form to call calculate winners if budget is reviewing_ballots
2017-06-25 15:47:04 +02:00
Alberto Garcia Cabeza
e7167855c4
improves admin budgets edit page
2017-04-24 13:12:44 +02:00
Alberto Garcia Cabeza
26ce2a1ae2
fixes admin budgets group table
2017-04-24 13:12:33 +02:00
Susana Truebano
e6f6a34054
fix close div and close thead in admin budgets groups edit partial
2017-02-27 13:04:56 +01:00
Juanjo Bazán
bdb55805a1
uses back_link_helper all around
2017-01-11 13:03:12 +01:00
Alberto Garcia Cabeza
8722699cd8
fixes typos and spec for budgets investments
2017-01-08 22:17:14 +01:00
kikito
5eec8c7da2
attempts to fix travis again
2017-01-05 12:32:36 +01:00
kikito
cc00af31b9
Merge branch 'budgets-admin-views' into budgets-gaspar
2017-01-04 17:57:46 +01:00
Alberto Garcia Cabeza
02359c8e2a
improves styles for admin budgets edit
2017-01-04 17:04:37 +01:00
Alberto Garcia Cabeza
46d96e5a18
improves styles for admin budgets show
2017-01-04 17:02:27 +01:00
Alberto Garcia Cabeza
e1367d4463
improves table of admin budgets index
2017-01-04 13:52:04 +01:00
kikito
0f174df5fe
Removes geozones from budget heading views and specs
2017-01-04 12:46:11 +01:00
kikito
9effcc4041
i18n
2017-01-01 15:04:06 +01:00
kikito
9e4b2fda89
Adds phases to form
2017-01-01 15:03:58 +01:00
Alberto Garcia Cabeza
73e3ea3560
fixes specs
2016-12-29 19:16:20 +01:00
kikito
34ee8c1c48
Makes Budgets editable, and makes their description editable with html
2016-12-29 16:21:42 +01:00
Juanjo Bazán
b0358e4867
adds index of investments with filters to admin
2016-09-05 17:50:58 +02:00
Juanjo Bazán
0f7e23bec4
adds budget's groups & headings to admin
2016-08-03 20:23:41 +02:00
Juanjo Bazán
724ccf175c
adds budget show to admin
2016-07-29 14:52:37 +02:00
Juanjo Bazán
6fce9df451
adds admin creation of budgets
2016-07-29 13:34:41 +02:00
Alberto Garcia Cabeza
3e892c6e76
Adds translations and improve example content
2016-07-28 19:21:53 +02:00
Alberto Garcia Cabeza
b69308b770
Adds example content for admin budget new
2016-07-28 13:04:30 +02:00
Juanjo Bazán
1ad78d599e
adds admin budgets index
2016-07-28 12:36:39 +02:00
