EditorController.js.patch

diff --git web-ui/src/main/resources/catalog/js/edit/EditorController.js web-ui/src/main/resources/catalog/js/edit/EditorController.js
index 08945644a3..da87ca2d0d 100644
--- web-ui/src/main/resources/catalog/js/edit/EditorController.js
+++ web-ui/src/main/resources/catalog/js/edit/EditorController.js
@@ -241,6 +241,7 @@
                   displayAttributes: $location.search()['displayAttributes'] === 'true',
                   displayTooltips: $location.search()['displayTooltips'] === 'true',
                   displayTooltipsMode: $location.search()['displayTooltipsMode'] || '',
+                  displaySections: ($location.search()['displaySections'] || 'true') === 'true',
                   compileScope: $scope,
                   formScope: $scope.$new(),
                   sessionStartTime: moment(),
@@ -274,6 +275,9 @@
                     + gnCurrentEdit.displayTooltipsMode ;
                 }
 
+                editorFormUrl += '&displaySections='
+			+ (gnCurrentEdit.displaySections === true ? 'true' : 'false');
+
                 gnEditor.load(editorFormUrl).then(function() {
                   // $scope.onFormLoad();
                   // Once the editor form is loaded, then
@@ -389,6 +393,14 @@
           gnUtilityService.scrollTo();
         }
 
+        // If switching between default and advanced view (or the opposite)
+        // Stay on the current tab (Dataset/Distribution)
+        if ($('#currTab')[0].value === 'defaultDistribution' && tabIdentifier === 'advancedDataset') {
+          tabIdentifier = 'advancedDistribution';
+        } else if ($('#currTab')[0].value === 'advancedDistribution' && tabIdentifier === 'defaultDataset') {
+          tabIdentifier = 'defaultDistribution';
+        }
+
         $('#currTab')[0].value = tabIdentifier;
         $('#flat')[0].value = mode === 'flat';