1791 Commits

Author SHA1 Message Date
c8077ac575 allow php 7 a force symfony 2.8 2016-01-05 14:04:45 +01:00
23ec2a1a16 fix issue with translations in tests 2016-01-05 14:02:07 +01:00
dabd58ed89 fix issue with password change + tests user lifecycle 2016-01-05 13:47:17 +01:00
84128fa718 transform raw value to serialized value in isEmptyValue 2016-01-05 12:10:49 +01:00
3c65e2d585 [export] add an export 'count activity' and first filters
- reason aggregator
- reason filter
- count activity export
2016-01-02 16:47:55 +01:00
0e0a764652 Merge remote-tracking branch 'framagit/master' 2016-01-01 22:26:47 +01:00
f288f67bb9 fix error with empty values with multiple and non-existant data
if a value was array(null) or array(_other => null, _choices => null),
the isEmptyValue function failed.
2016-01-01 22:25:05 +01:00
b4ce83453c Merge branch 'master' into 'master'
Various improvements

- Introduce tests for twig functions ;
- Make the twig function `chill_custom_field_is_emtpy` consistent with other functions ;
- remove dead code from CustomFieldsHelper ;
- add validation on custom field slug
- fix bug in test
- re-introduce the units label in numeric/integer custom fields

See merge request !12
2016-01-01 16:25:59 +01:00
9fe445ed20 layout of post-text extension 2015-12-30 16:58:01 +01:00
f145ae7f88 re-introduce post_text extension in fields.html.twig + tests 2015-12-30 16:57:16 +01:00
8849d8bb54 fix test for custom field helper
The test was requesting an entity not present in database
2015-12-29 17:54:00 +01:00
546fe49960 ignore platform reqs on build 2015-12-29 17:09:04 +01:00
7a8ef70cd1 fix renderLabel signature 2015-12-29 17:04:58 +01:00
287c70c6f3 add validation rule on slug for custom fields 2015-12-28 21:16:01 +01:00
3d2426d8df allow php7 and upgrade to symfony 2.8 2015-12-28 20:59:19 +01:00
cad44ae461 fix test 'complete scenario'
The link 'modifier' was changed to 'Modifier'
2015-12-28 20:54:34 +01:00
54391b02f3 consistency in twig methods
The method chill_custom_fields_is_empty take now the fields as first argument, and the customField as second argument, to be consistent with other twig methods.
2015-12-28 00:54:38 +01:00
d2039893b3 Simplifiying Helper and twig functions
Now, the CustomFieldsHelper methods and the twig function which render customFields require always a `Chill\CustomFields\Entity\CustomField`.

The possibility to add a slug and an object as argument to those method is abandoned, and was not used in other bundle (nevertheless, the method to catch a customField from his slug was buggy).
2015-12-28 00:38:27 +01:00
89221599d4 Merge branch 'add_gitlab_ci' 2015-12-24 16:09:26 +01:00
f7dd99ab87 add test for custom_fields_group_widget 2015-12-24 16:05:49 +01:00
7a73c0170c set a composer root version + select image php-7
The composer root version is required to let composer decide on which branch he is, as we have mirrored dependencies (custom field requires person, which requires custom field).

The php 7 build select now php 7 image
2015-12-24 15:16:04 +01:00
1de944f838 Merge branch 'master' into add_gitlab_ci
Conflicts:
	.gitignore
2015-12-24 15:00:00 +01:00
09a69765b9 adding test for customFieldRendering function 2015-12-23 23:46:44 +01:00
3e5a90c36c escaping argument 2015-12-23 23:46:15 +01:00
daf7d1f71f improve layout of report + flash message 2015-12-18 01:44:11 +01:00
573697d8c7 improve function isEmptyValue + tests 2015-12-18 00:22:09 +01:00
24f9db6ae7 fix bug in changing custom field option
bug description :

> if you change the options of a custom field choice (i.e. from a
> multiple to a single, removing or adding allow_other), the data
> representation change and do not match with the expected
> representation of the form.

This commit fix this bug by switching the data representation to the
current options.
2015-12-17 23:50:24 +01:00
9867cca632 improve rendering of cfgroup index 2015-12-17 22:16:06 +01:00
60dc11caed translation in choices name 2015-12-17 22:12:50 +01:00
cbc66dc0f0 allow choosing empty value in CFLongChoice 2015-12-17 22:07:28 +01:00
d77f85dbd0 greater textarea 2015-12-17 21:53:15 +01:00
9aa686fac6 select radio button with empty value
if multiple radio button doesn't have a value, the default one is
checked.

This is done using javascript, currently.
2015-12-17 21:46:53 +01:00
9c622bc852 improve cfgroup rendering to show title only if necessary
If the value `chill_custom_fields.show_empty_values_in_views` is false,
the title is shown only if a field has been filled "below" the title.
2015-12-17 07:46:06 +01:00
0a1898e9a7 take into account the different type of choices in empty value 2015-12-16 20:25:40 +01:00
06cc78c5cb mark test skipped as the hack is not working 2015-12-16 12:56:03 +01:00
9f9bc8ab4d adapt to symfony 2.8 2015-12-16 12:55:41 +01:00
fe73a64e9d Add possibility to hide empty value in customfield group view rendering
A new parameter is defined :

```
chill_custom_fields:
    show_empty_values_in_views = true|false
```

A new method is added to CustomFieldInterface: `isEmptyValue`. To ease
the dev of new classes, an AbstractCustomField class is created, which
implements the most commons function (currently, only isEmptyValue).

A new Twig Filter is added: `chill_custom_field_is_empty`

The twig filter `chill_custom_fields_group_widget` has a new possibility
in array option : `show_empty`. Default to
chill_custom_fields.show_empty_values_in_view. May be forced by
true/false.
2015-12-15 11:11:36 +01:00
590762889b Merge branch 'master' into '1.0'
Select2js allow clear



See merge request !3
2015-12-15 11:01:04 +01:00
Marc Ducobu
9f4286d297 Select2js allow clear 2015-12-15 10:08:37 +01:00
9ca2be78eb use localize translatable string function to render label widget 2015-12-15 10:06:05 +01:00
65e7a130c5 adapt config for test to symfony 2.8
replace intention by 'csrf_token_id' in security part
2015-12-14 21:55:19 +01:00
c1e7bc0013 Merge branch 'master' into '1.0'
CF #16 - Improve the layout



See merge request !2
2015-12-11 15:03:49 +01:00
Marc Ducobu
9a957a9704 CF #16 - Improve the layout 2015-12-11 13:51:46 +01:00
69da4ce4c9 Merge branch 'master' into 1.0 2015-12-11 12:04:01 +01:00
faf4583383 Merge branch 'custom_field_long_choice' 2015-12-11 11:48:14 +01:00
09439f4e77 Merge branch 'required_fields' into 'master'
add a required field to custom fields type

ref Chill-project/Chill-CustomFields#17

Add a `required` column to the `customfield` table, add a `required` field in customfieldsGroup form.

If the customfield is required, the field is marked as required in the customfield type (when the form is compiled). Although, for compound type (like choices) it is necessary to mark the type manually as required.

See merge request !8
2015-12-11 11:46:51 +01:00
4f13ec6959 add a custom field long choice basic
The `custom field long choice` aim to provide a way to deal with choices
with a big possibilities.

The `custom field long choice` allow :
- to persist different options in the database ;
- each option has a key, a text (translatable string), and eventually a
  parent, and an internal_key
- every key can be activate or not. If the parent is inactivated, all
  childs are inactivated
- the internal key have two purposes :
    - link to an external csv file, with their own key ;
    - add a special class to results, to allow custom layout.

Currently, the field exists, but some elements are missing :

- a script for CSV import
- possibility to select multiple items
- edition of options
- handle of option without parents
- tests are missing
2015-12-11 11:43:39 +01:00
3230659a4b add a required field to custom fields type
ref Chill-project/Chill-CustomFields#17
2015-12-10 17:16:59 +01:00
25626a6a45 Merge branch 'master' into 'master'
Choice widget expanded use the .inline_choice class & choice_with_other_widget d…

…isplay the label and the input on the same line

See merge request !1
2015-12-10 15:49:23 +01:00
b88bb50b56 Merge branch 'marcu/Chill-CustomFields-master'
Merge request Chill-project/Chill-CustomFields!5

Conflicts:
	Resources/views/Form/fields.html.twig
2015-12-10 15:44:20 +01:00