mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
#16 replace hardcoded country and map_center in vue add-address by symfony config yaml variables
This commit is contained in:
parent
56a7833858
commit
53980dd757
@ -142,7 +142,12 @@ class ChillMainExtension extends Extension implements
|
||||
'chill_main.access_permissions_group_list',
|
||||
$config['access_permissions_group_list']
|
||||
);
|
||||
|
||||
|
||||
$container->setParameter(
|
||||
'chill_main.add_address',
|
||||
$config['add_address']
|
||||
);
|
||||
|
||||
$container->setParameter(
|
||||
'chill_main.routing.resources',
|
||||
$config['routing']['resources']
|
||||
@ -215,6 +220,7 @@ class ChillMainExtension extends Extension implements
|
||||
'installation' => [
|
||||
'name' => $config['installation_name'], ],
|
||||
'available_languages' => $config['available_languages'],
|
||||
'add_address' => $config['add_address']
|
||||
],
|
||||
'form_themes' => ['@ChillMain/Form/fields.html.twig'],
|
||||
];
|
||||
|
@ -266,7 +266,18 @@ class Configuration implements ConfigurationInterface
|
||||
->end()
|
||||
->end() // end of root/children
|
||||
->end() // end of root
|
||||
;
|
||||
;
|
||||
|
||||
$rootNode->children()
|
||||
->arrayNode('add_address')->children()
|
||||
->scalarNode('default_country')->cannotBeEmpty()->end()
|
||||
->arrayNode('map_center')->children()
|
||||
->scalarNode('x')->cannotBeEmpty()->end()
|
||||
->scalarNode('y')->cannotBeEmpty()->end()
|
||||
->scalarNode('z')->cannotBeEmpty()->end()
|
||||
->end()
|
||||
->end()
|
||||
;
|
||||
|
||||
return $treeBuilder;
|
||||
}
|
||||
|
@ -309,8 +309,11 @@ export default {
|
||||
addressMap: {
|
||||
// Note: LeafletJs demands [lat, lon]
|
||||
// cfr https://macwright.com/lonlat/
|
||||
center : [48.8589, 2.3469],
|
||||
zoom: 12
|
||||
center : [
|
||||
this.context.defaults.map_center.x,
|
||||
this.context.defaults.map_center.y
|
||||
],
|
||||
zoom: this.context.defaults.map_center.z
|
||||
},
|
||||
},
|
||||
errorMsg: []
|
||||
|
@ -44,7 +44,7 @@ export default {
|
||||
//console.log('update map with : ', this.entity.addressMap.center)
|
||||
if (this.marker && this.entity.addressMap.center) {
|
||||
this.marker.setLatLng(this.entity.addressMap.center);
|
||||
this.map.setView(this.entity.addressMap.center, 15);
|
||||
this.map.setView(this.entity.addressMap.center, this.entity.addressMap.zoom);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -30,7 +30,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
value: this.selectCountryByCode(
|
||||
this.context.edit ? this.entity.selected.country.code : 'FR'
|
||||
this.context.edit ? this.entity.selected.country.code : this.context.defaults.default_country
|
||||
)
|
||||
}
|
||||
},
|
||||
|
@ -102,7 +102,7 @@ export default {
|
||||
],
|
||||
emits: ['openEditPane'],
|
||||
mounted() {
|
||||
console.log('context', this.context)
|
||||
//console.log('context', this.context)
|
||||
},
|
||||
computed: {
|
||||
address() {
|
||||
|
@ -20,7 +20,8 @@ containers.forEach((container) => {
|
||||
},
|
||||
edit: container.dataset.mode === 'edit', //boolean
|
||||
addressId: parseInt(container.dataset.addressId) || null,
|
||||
backUrl: container.dataset.backUrl || null
|
||||
backUrl: container.dataset.backUrl || null,
|
||||
defaults: JSON.parse(container.dataset.addressDefaults)
|
||||
},
|
||||
options: {
|
||||
/// Options override default.
|
||||
|
@ -72,6 +72,8 @@
|
||||
{% if onlyButton is defined and onlyButton == 1 %}
|
||||
data-hide-address="true"
|
||||
{% endif %}
|
||||
|
||||
data-address-defaults="{{ add_address|json_encode|e('html') }}"
|
||||
></div>
|
||||
|
||||
{{ encore_entry_script_tags('vue_address') }}
|
||||
|
Loading…
x
Reference in New Issue
Block a user