rgarcia
af7d71ccfd
Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets
2016-12-26 11:14:56 +01:00
kikito
2c396f83a7
makes spec less likely to fail by increasing the number of random stuff generated in a random sorting
2016-12-25 23:45:58 +01:00
kikito
526a6e2097
i18n
2016-12-25 23:18:58 +01:00
kikito
84418bd671
Fixes issue in has_orders concern
2016-12-25 22:58:21 +01:00
kikito
c6648ec39a
Fixes investment_spec and adds one more check for selected
2016-12-25 21:04:19 +01:00
kikito
46901a8117
Refactors ballots_spec by removing repeated lines
2016-12-25 20:58:57 +01:00
kikito
9081810a92
Removes parameters using automatic denormalization
2016-12-25 20:38:27 +01:00
kikito
a0d79992df
refactors repetitive declarations out of ballots_spec
2016-12-25 20:29:43 +01:00
kikito
f9045cf95a
refactors repetitive declarations in specs
2016-12-25 20:01:28 +01:00
kikito
b1e45bfe2d
refactor spec to reutilize user variable
2016-12-25 19:29:13 +01:00
kikito
3ac7d88737
Makes spec/features/budgets/ballots_spec pass
2016-12-25 12:58:22 +01:00
kikito
7089d965d5
Removes unused common actions
2016-12-25 12:57:57 +01:00
kikito
4b92cf3acf
Removes unused error messages from 18n
2016-12-25 12:57:46 +01:00
kikito
32710f57e1
Organization instead of organisation
2016-12-25 12:57:34 +01:00
kikito
adaa4731aa
Uses complete path for partial
2016-12-25 12:57:15 +01:00
kikito
f1a550bdb0
Allows rendering budget investment header when the @heading variable is not set up
2016-12-25 12:57:01 +01:00
kikito
2815b28cd1
changes header message to include assigned heading link
2016-12-25 12:56:31 +01:00
kikito
9af8eb8d52
Changes i18n namespace for errors
2016-12-25 12:55:39 +01:00
kikito
53233c365a
Adds a new reason for not being ballotable
2016-12-25 12:55:03 +01:00
kikito
e15377b7d8
Load @assigned_heading in addition to loading @heading
2016-12-25 12:54:48 +01:00
kikito
ef0acaf20f
Only creates ballot when budget balloting
2016-12-25 12:54:32 +01:00
kikito
3fd1993f74
only creates ballots when budget balloting
2016-12-25 12:54:07 +01:00
kikito
2fab251593
adds i18n entries
2016-12-25 12:53:27 +01:00
kikito
8e4bd43069
Makes the selected trait also mark projects feasible and valuation_finished
2016-12-24 14:43:12 +01:00
kikito
03ef20bfde
Merges orders_helper functionality inside has_orders concern
...
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +01:00
Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
Juanjo Bazán
8b4f519d71
adds booth assignation to admin poll
2016-12-23 19:06:55 +01:00
Juanjo Bazán
89979e549f
adds search to Booth model
2016-12-23 19:06:55 +01:00
Juanjo Bazán
ae6bccd98f
Merge pull request #1304 from consul/polls-views
...
polls views
2016-12-23 19:06:35 +01:00
rgarcia
ddeca6f06d
fixes specs
2016-12-23 19:05:25 +01:00
rgarcia
37462b79cd
removes unused translations
2016-12-23 18:37:39 +01:00
kikito
767c537883
Fixes 1 spec in investments_spec
2016-12-23 18:37:14 +01:00
kikito
bbb8ac830c
Fixes erroneous i18n param in view
2016-12-23 18:37:02 +01:00
kikito
de1ade0eb8
Fixes erroneous link in view
2016-12-23 18:36:42 +01:00
kikito
0cb0775872
Uses selected instead of valuation_finished in investment_spec
2016-12-23 18:36:19 +01:00
kikito
56b19b257d
Uses add_to_ballot in a bunch of specs
2016-12-23 18:35:25 +01:00
kikito
4589ba5f0b
Fixes incorrect implementation of add_to_ballot common action
2016-12-23 18:34:42 +01:00
Alberto Garcia Cabeza
082c483269
removes unnecessary method on questions controller
2016-12-23 18:31:45 +01:00
Juanjo Bazán
08049db169
Merge pull request #1303 from ferblape/extract-mailer-from-to-setting
...
Extract mailer from name and address to a setting
2016-12-23 16:08:06 +01:00
Fernando Blat
8c8b273de0
Settings translation
2016-12-23 15:51:20 +01:00
Fernando Blat
05a00df8ed
Set the default from address as consul.dev
2016-12-23 15:46:39 +01:00
Fernando Blat
85ce7d7227
Devise won't read mail from Settings in test environment
2016-12-23 15:45:20 +01:00
kikito
9e0007ba35
renames i18n entry
2016-12-23 15:38:31 +01:00
kikito
0578fb5479
Fixes errors when adding investments to ballots in specs
2016-12-23 15:38:21 +01:00
kikito
615217e36e
Fixes errors in header view
2016-12-23 15:37:55 +01:00
kikito
a589d8a76d
Simplifies ballot.add_investment using automatic denormalization
2016-12-23 15:37:32 +01:00
kikito
21f396faaa
Fixes budget model specs using :selected & automatic line denormalization
2016-12-23 15:23:31 +01:00
kikito
f125941bbf
Tweaks unselected error in ballot/line
2016-12-23 15:22:19 +01:00
Alberto Garcia Cabeza
dc27514fa7
updates texts on specs
2016-12-23 14:41:42 +01:00
Alberto Garcia Cabeza
c0c76b67c2
adds successful proposals list on admin questions index
2016-12-23 14:16:29 +01:00
