From efca172d2890de136ec710f1a08651d34f456b33 Mon Sep 17 00:00:00 2001
From: Gabriel Jenik <gabriel.jenik@gmail.com>
Date: Tue, 31 May 2022 05:02:03 -0300
Subject: [PATCH] Fixed issue #17837: Directly show edit mode: some quirks
 (#2441)

---
 .../QuestionGroupsAdministrationController.php       |  3 ++-
 .../views/includes/groupToolsDropdownItems.php       | 12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/application/controllers/QuestionGroupsAdministrationController.php b/application/controllers/QuestionGroupsAdministrationController.php
index 857e9405c03..fca3bea1db1 100644
--- a/application/controllers/QuestionGroupsAdministrationController.php
+++ b/application/controllers/QuestionGroupsAdministrationController.php
@@ -585,7 +585,8 @@ public function actionDelete(bool $asJson = false)
 
         LimeExpressionManager::UpgradeConditionsToRelevance($iSurveyId);
         $survey = Survey::model()->findByPk($iSurveyId);
-        if (!empty($survey->groups)) {
+        $landOnSideMenuTab = Yii::app()->request->getPost('landOnSideMenuTab');
+        if ($landOnSideMenuTab == 'structure' && !empty($survey->groups)) {
             $this->redirect(
                 Yii::app()->createUrl(
                     'questionGroupsAdministration/view/',
diff --git a/application/extensions/TopbarWidget/views/includes/groupToolsDropdownItems.php b/application/extensions/TopbarWidget/views/includes/groupToolsDropdownItems.php
index 6cfcfef4139..6859a77505b 100644
--- a/application/extensions/TopbarWidget/views/includes/groupToolsDropdownItems.php
+++ b/application/extensions/TopbarWidget/views/includes/groupToolsDropdownItems.php
@@ -27,7 +27,17 @@
                 <a href="#" onclick="return false;"
                     data-toggle="modal"
                     data-target="#confirmation-modal"
-                    data-onclick='(function() { <?php echo convertGETtoPOST(Yii::app()->createUrl("questionGroupsAdministration/delete/", ["asJson" => true, "surveyid" => $surveyid, "gid"=>$gid])); ?> })'
+                    data-onclick='(function() { <?php echo convertGETtoPOST(
+                        Yii::app()->createUrl(
+                            "questionGroupsAdministration/delete/",
+                            [
+                                "asJson" => true,
+                                "surveyid" => $surveyid,
+                                "gid" => $gid,
+                                "landOnSideMenuTab" => 'structure'
+                            ]
+                        )
+                    ); ?> })'
                     data-message="<?php eT("Deleting this group will also delete any questions and answers it contains. Are you sure you want to continue?","js"); ?>"
                 >
                     <span class="fa fa-trash text-danger"></span>