From 1adf69d5c53f0ba2457e9ce30db8aab0fdbd63d4 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Fri, 18 Jan 2013 22:17:41 +0100
Subject: [PATCH] Fixed issue #7210: When deleting a question group all
 relevance equations in the survey are set to '1'

---
 application/controllers/admin/questiongroup.php               | 4 +---
 .../admin/survey/QuestionGroups/questiongroupbar_view.php     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/controllers/admin/questiongroup.php b/application/controllers/admin/questiongroup.php
index aabf6699725..7fdec4734d1 100644
--- a/application/controllers/admin/questiongroup.php
+++ b/application/controllers/admin/questiongroup.php
@@ -244,10 +244,8 @@ public function delete($iSurveyId, $iGroupId)
             }
             else
                 Yii::app()->user->setFlash('flashmessage', $clang->gT('Group could not be deleted'));
-
-            $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $iSurveyId));
-
             LimeExpressionManager::UpgradeConditionsToRelevance($iSurveyId);
+            $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $iSurveyId));
         }
     }
 
diff --git a/application/views/admin/survey/QuestionGroups/questiongroupbar_view.php b/application/views/admin/survey/QuestionGroups/questiongroupbar_view.php
index 1e3916ce511..4a08ce9b5f4 100644
--- a/application/views/admin/survey/QuestionGroups/questiongroupbar_view.php
+++ b/application/views/admin/survey/QuestionGroups/questiongroupbar_view.php
@@ -45,7 +45,7 @@
                     // TMSW Conditions->Relevance:  Should be allowed to delete group even if there are conditions/relevance, since separate view will show exceptions
 
                     { ?>
-                    <a href='<?php echo $this->createUrl("admin/questiongroup/sa/view/surveyid/$surveyid/gid/$gid"); ?>' onclick="alert('<?php $clang->eT("Impossible to delete this group because there is at least one question having a condition on its content","js"); ?>')">
+                    <a href='<?php echo $this->createUrl("admin/survey/sa/view/surveyid/$surveyid/gid/$gid"); ?>' onclick="alert('<?php $clang->eT("Impossible to delete this group because there is at least one question having a condition on its content","js"); ?>'); return false;">
                         <img src='<?php echo $imageurl; ?>delete_disabled.png' alt='<?php $clang->eT("Delete current question group"); ?>' width="<?php echo $iIconSize;?>" height="<?php echo $iIconSize;?>"/></a>
                     <?php }
                 }