Mercurial > gemma

changeset 4330:fe01e997d66f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adjust sys-config values for geo styling in schema * add opacity values for distanc-marks-axis/ashore * update schema version * update script will overwrite the user changed style-values with default values.
author Fadi Abbud <fadi.abbud@intevation.de>
date Thu, 05 Sep 2019 09:19:42 +0200
parents 83eb99662a91
children 98497ac4af3c
files schema/default_sysconfig.sql schema/updates/1111/01.styles_config.sql schema/version.sql
diffstat 3 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/schema/default_sysconfig.sql	Wed Sep 04 17:05:43 2019 +0200
+++ b/schema/default_sysconfig.sql	Thu Sep 05 09:19:42 2019 +0200
@@ -47,11 +47,11 @@
 INSERT INTO sys_admin.system_config VALUES ('fairwaydimensionslos3_fill','#ffffff66');
 INSERT INTO sys_admin.system_config VALUES ('waterwayprofiles_stroke','#0000ff80');
 
-INSERT INTO sys_admin.system_config VALUES ('distance_marks_fill', '#ff9999');
+INSERT INTO sys_admin.system_config VALUES ('distance_marks_fill', '#ff99994d');
 INSERT INTO sys_admin.system_config VALUES ('distance_marks_stroke', '#6666ff');
-INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_fill', '#8888FF');
-INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_stroke', '#3333FF');
-INSERT INTO sys_admin.system_config VALUES ('waterway_axis_stroke', '#0000FF');
+INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_fill', '#8888ff1a');
+INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_stroke', '#3333ff');
+INSERT INTO sys_admin.system_config VALUES ('waterway_axis_stroke', '#0000ff');
 INSERT INTO sys_admin.system_config VALUES ('waterway_area_stroke', '#006600');
 
 COMMIT;
--- a/schema/updates/1111/01.styles_config.sql	Wed Sep 04 17:05:43 2019 +0200
+++ b/schema/updates/1111/01.styles_config.sql	Thu Sep 05 09:19:42 2019 +0200
@@ -1,4 +1,7 @@
-INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_fill', '#8888FF') ON CONFLICT (config_key) DO NOTHING;
-INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_stroke', '#3333FF') ON CONFLICT (config_key) DO NOTHING;
-INSERT INTO sys_admin.system_config VALUES ('waterway_axis_stroke', '#0000FF') ON CONFLICT (config_key) DO NOTHING;
-INSERT INTO sys_admin.system_config VALUES ('waterway_area_stroke', '#006600') ON CONFLICT (config_key) DO NOTHING;
\ No newline at end of file
+INSERT INTO sys_admin.system_config VALUES ('distance_marks_fill', '#ff99994d') ON CONFLICT (config_key) DO NOTHING;
+INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_fill', '#8888ff1a') ON CONFLICT (config_key) DO NOTHING;
+INSERT INTO sys_admin.system_config VALUES ('distance_marks_ashore_stroke', '#3333ff') ON CONFLICT (config_key) DO NOTHING;
+INSERT INTO sys_admin.system_config VALUES ('waterway_axis_stroke', '#0000ff') ON CONFLICT (config_key) DO NOTHING;
+INSERT INTO sys_admin.system_config VALUES ('waterway_area_stroke', '#006600') ON CONFLICT (config_key) DO NOTHING;
+
+-- The user changed styles will be overwritten with the default values.
\ No newline at end of file
--- a/schema/version.sql	Wed Sep 04 17:05:43 2019 +0200
+++ b/schema/version.sql	Thu Sep 05 09:19:42 2019 +0200
@@ -1,1 +1,1 @@
-INSERT INTO gemma_schema_version(version) VALUES (1110);
+INSERT INTO gemma_schema_version(version) VALUES (1111);