Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/release 0 8 #367

Open
wants to merge 2 commits into
base: dev-suivi-eolien
Choose a base branch
from
Open

Fix/release 0 8 #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bf161e
Fix : installation module sans site.json
amandine-sahl Aug 2, 2024
23bee26
Style : Observateur de visite
amandine-sahl Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backend/gn_module_monitoring/config/generic/visit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"type_util": "user",
"multiple": true,
"hidden": false,
"required": true
"required": true,
"designStyle": "bootstrap"
},
"observers_txt": {
"type_widget": "observers-text",
Expand Down
4 changes: 3 additions & 1 deletion backend/gn_module_monitoring/config/repositories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ def config_object_from_files(module_code, object_type, custom=None, is_sites_gro
if object_type == "site":
db_config_object = json_config_from_db(module_code)
# Mise a jour des configurations de façon récursive
dict_deep_update(specific_config_object["specific"], db_config_object["specific"])
dict_deep_update(
specific_config_object.get("specific", {}), db_config_object.get("specific", {})
)

elif object_type == "module":
db_config_object = json_config_from_db(module_code)
Expand Down
Loading