From b2f44eeeb4f60ee87662c2d45ffbdf5f2b4ba843 Mon Sep 17 00:00:00 2001 From: volterra79 Date: Wed, 11 Oct 2023 11:57:14 +0200 Subject: [PATCH 1/8] Fix main sidebar z-index --- src/assets/style/less/g3w-sidebar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/style/less/g3w-sidebar.less b/src/assets/style/less/g3w-sidebar.less index 28d0af209..694d69fea 100644 --- a/src/assets/style/less/g3w-sidebar.less +++ b/src/assets/style/less/g3w-sidebar.less @@ -18,7 +18,7 @@ &.mobile { width: @sidebar-width-small; } - //z-index: 1 !important; + z-index: 1 !important; } #g3w-sidebar.sidebar { From 4d6ee9d67c6285e1d964830be75871e45aadf4df Mon Sep 17 00:00:00 2001 From: volterra79 Date: Wed, 11 Oct 2023 11:59:24 +0200 Subject: [PATCH 2/8] Fix issue on relation tab when a qgis project has form with a tab contain relations and after time it remove a layers related to this relation --- src/components/GlobalTabsNode.vue | 6 ++++-- src/components/QueryResults.vue | 2 +- src/components/Relations.vue | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/GlobalTabsNode.vue b/src/components/GlobalTabsNode.vue index 46a929145..5b146640e 100644 --- a/src/components/GlobalTabsNode.vue +++ b/src/components/GlobalTabsNode.vue @@ -99,9 +99,11 @@ } }, methods: { - loadingRelation(relation){ + loadingRelation(relation) { const layer = ProjectsRegistry.getCurrentProject().getLayerById(this.layerid); - const relation_project = layer.getRelationById(relation.name); + //@since v3.9.0 to prevent console error when in QGIS is create a tab with relation but project + //haven't relations + const relation_project = layer.getRelationById(relation.name) || {state: {loading: false}}; return relation_project.state; }, isRelationDisabled(relation){ diff --git a/src/components/QueryResults.vue b/src/components/QueryResults.vue index 3c31495a7..e3cb99448 100644 --- a/src/components/QueryResults.vue +++ b/src/components/QueryResults.vue @@ -102,7 +102,7 @@ - + diff --git a/src/components/Relations.vue b/src/components/Relations.vue index 2f8b51b45..28528605c 100644 --- a/src/components/Relations.vue +++ b/src/components/Relations.vue @@ -12,7 +12,7 @@
-
+
{{ relation.name }}
From a167da220558da5d2b009457b287816319fb6e7f Mon Sep 17 00:00:00 2001 From: volterra79 Date: Wed, 11 Oct 2023 14:59:17 +0200 Subject: [PATCH 3/8] Remove close element tag --- src/components/FieldImage.vue | 2 +- src/components/GlobalImage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/FieldImage.vue b/src/components/FieldImage.vue index e1b435fcf..87983d774 100644 --- a/src/components/FieldImage.vue +++ b/src/components/FieldImage.vue @@ -7,7 +7,7 @@
- +
diff --git a/src/components/GlobalImage.vue b/src/components/GlobalImage.vue index 644300383..b3c74f3d0 100644 --- a/src/components/GlobalImage.vue +++ b/src/components/GlobalImage.vue @@ -10,7 +10,7 @@
- + From 52274e63a99772f26b571f8b0052c59a9b62e560 Mon Sep 17 00:00:00 2001 From: volterra79 Date: Wed, 11 Oct 2023 15:07:41 +0200 Subject: [PATCH 4/8] Use ZINDEX constant to manage sidebar-aside-toggle button element and avoid to be hide when open right content menu to 100%. --- src/components/Sidebar.vue | 160 +++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 77 deletions(-) diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index c961ecfc6..1a26b0e38 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -4,102 +4,102 @@ --> \ No newline at end of file From 199a6604af671364e4893994052c74e0db2c6f47 Mon Sep 17 00:00:00 2001 From: volterra79 Date: Thu, 12 Oct 2023 10:00:32 +0200 Subject: [PATCH 5/8] Remove useless scope style --- src/components/Sidebar.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 1a26b0e38..cdafc61c1 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -170,8 +170,5 @@ \ No newline at end of file From aae94900ca6cae11d049b992c26c2aa445922dab Mon Sep 17 00:00:00 2001 From: volterra79 Date: Thu, 12 Oct 2023 10:01:33 +0200 Subject: [PATCH 6/8] Change less css property to work with sidebar-aside-toggle as sibling of main-header class and not child --- .../style/less/admin-lte2-less/sidebar.less | 17 ++++++++++------- src/assets/style/less/g3w-sidebar.less | 15 +++++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/assets/style/less/admin-lte2-less/sidebar.less b/src/assets/style/less/admin-lte2-less/sidebar.less index aa7a0010f..dab9db1be 100644 --- a/src/assets/style/less/admin-lte2-less/sidebar.less +++ b/src/assets/style/less/admin-lte2-less/sidebar.less @@ -6,14 +6,8 @@ // ``` .left-side has been deprecated as of 2.0.0 in favor of .main-sidebar ``` .main-sidebar, +.sidebar-aside-toggle, .left-side { - position: absolute; - top: 0; - left: 0; - padding-top: 50px; - min-height: 100%; - width: @sidebar-width; - z-index: 810; //Using disposable variable to join statements with a comma @transition-rule: @transition-speed @transition-fn, width @transition-speed @transition-fn; @@ -36,6 +30,15 @@ } } +.left-side { + position: absolute; + top: 0; + left: 0; + padding-top: 50px; + min-height: 100%; + z-index: 810; +} + .sidebar { padding-bottom: 0px; } diff --git a/src/assets/style/less/g3w-sidebar.less b/src/assets/style/less/g3w-sidebar.less index 694d69fea..9aa4a21cd 100644 --- a/src/assets/style/less/g3w-sidebar.less +++ b/src/assets/style/less/g3w-sidebar.less @@ -3,6 +3,12 @@ @sidebar-width: 350px; @control-sidebar-width: 450px; +a.sidebar-aside-toggle { + @media (max-width: @screen-xs-max) { + display: none !important; + } +} + .main-sidebar{ &.iframe{ padding-top:0 !important; @@ -10,11 +16,7 @@ top: 0! important; } } - a.sidebar-aside-toggle { - @media (max-width: @screen-xs-max) { - display: none !important; - } - } + &.mobile { width: @sidebar-width-small; } @@ -166,8 +168,9 @@ .main-sidebar, .main-sidebar-mobile, .left-side { + width: @sidebar-width; @media (max-width: @screen-xs-max) { - width: @sidebar-width-mobile; + width: @sidebar-width-mobile; } @media (max-width: @screen-xs-max) { .translate(-@sidebar-width-mobile, 0); From 031733579a8658c5735ef9e39d8768d5c72e9cd4 Mon Sep 17 00:00:00 2001 From: Raruto Date: Thu, 12 Oct 2023 14:42:26 +0200 Subject: [PATCH 7/8] comments --- src/components/GlobalTabsNode.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/GlobalTabsNode.vue b/src/components/GlobalTabsNode.vue index 5b146640e..5aa091c90 100644 --- a/src/components/GlobalTabsNode.vue +++ b/src/components/GlobalTabsNode.vue @@ -101,10 +101,8 @@ methods: { loadingRelation(relation) { const layer = ProjectsRegistry.getCurrentProject().getLayerById(this.layerid); - //@since v3.9.0 to prevent console error when in QGIS is create a tab with relation but project - //haven't relations - const relation_project = layer.getRelationById(relation.name) || {state: {loading: false}}; - return relation_project.state; + // FIXME: prevent a fatal error when creating a relation Tab (even if the project has no relations) + return layer.getRelationById(relation.name) || ({ state: {loading: false} }).state; }, isRelationDisabled(relation){ return this.getRelationName(relation.name) === undefined || (this.contenttype === 'editing' && this.isRelationChildLayerNotEditable(relation)); From e7b9c51dd0a5693ef218021a259046d1d1145e42 Mon Sep 17 00:00:00 2001 From: Raruto Date: Thu, 12 Oct 2023 14:45:48 +0200 Subject: [PATCH 8/8] Update Sidebar.vue --- src/components/Sidebar.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index cdafc61c1..6cae27083 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -98,7 +98,7 @@ import ApplicationState from 'store/application-state'; import { SidebarEventBus as VM } from 'app/eventbus'; import sidebarService from 'services/sidebar'; - import { ZINDEXES } from 'app/constant'; + import { ZINDEXES } from 'app/constant'; const { t } = require('core/i18n/i18n.service'); @@ -115,7 +115,7 @@ bPageMode: false, header: t('main navigation'), state: sidebarService.state, - //@since v3.9.0 + /** @since v3.9.0 */ zIndex: ZINDEXES.usermessage.tool + 2, }