Fixed issue #7134: Impossible to view users in a group if using IIS

LimeSurvey · Jan 3, 2013 · 725ec99 · 725ec99
1 parent 92d26ba
commit 725ec99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/application/controllers/admin/usergroups.php b/application/controllers/admin/usergroups.php
@@ -232,12 +232,12 @@ function edit($ugid)
                 if (User_groups::model()->updateGroup($db_name, $db_description, $ugid)) {
                     Yii::app()->session['flashmessage'] = $clang->gT("User group successfully saved!");
 					$aData['ugid'] = $ugid;
-                    Yii::app()->request->redirect($this->getController()->createUrl('admin/usergroups/view/ugid/'.$ugid));
+                    Yii::app()->request->redirect($this->getController()->createUrl('admin/usergroups/sa/view/ugid/'.$ugid));
                 }
                 else
                 {
                     Yii::app()->session['flashmessage'] = $clang->gT("Failed to edit user group!");
-                    Yii::app()->request->redirect($this->getController()->createUrl('admin/usergroups/edit/ugid/'.$ugid));
+                    Yii::app()->request->redirect($this->getController()->createUrl('admin/usergroups/sa/edit/ugid/'.$ugid));
                 }
 
             }

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -7163,7 +7163,7 @@ function getUserGroupList($ugid=NULL,$outputformat='optionlist')
             //if (isset($_GET['ugid']) && $gn['ugid'] == $_GET['ugid']) {$selecter .= " selected='selected'"; $svexist = 1;}
 
             if ($gn['ugid'] == $ugid) {$selecter .= " selected='selected'"; $svexist = 1;}
-            $link = Yii::app()->getController()->createUrl("/admin/usergroups/view/ugid/".$gn['ugid']);
+            $link = Yii::app()->getController()->createUrl("/admin/usergroups/sa/view/ugid/".$gn['ugid']);
             $selecter .=" value='{$link}'>{$gn['name']}</option>\n";
             $simplegidarray[] = $gn['ugid'];
         }

diff --git a/application/views/admin/usergroup/usergroupbar_view.php b/application/views/admin/usergroup/usergroupbar_view.php
@@ -38,7 +38,7 @@
                 if($ugid && $grpresultcount > 0 &&  (Yii::app()->session['loginID'] == $grow['owner_id'] || hasGlobalPermission('USER_RIGHT_SUPERADMIN')))
                 { ?>
 
-                <a href='#' onclick="if (confirm('<?php $clang->eT("Are you sure you want to delete this entry?","js"); ?>')) { <?php echo convertGETtoPOST($this->createUrl('admin/usergroups/delete')."?action=delusergroup&amp;ugid=$ugid"); ?>}">
+                <a href='#' onclick="if (confirm('<?php $clang->eT("Are you sure you want to delete this entry?","js"); ?>')) { <?php echo convertGETtoPOST($this->createUrl('admin/usergroups/sa/delete')."?action=delusergroup&amp;ugid=$ugid"); ?>}">
                     <img src='<?php echo $imageurl; ?>delete.png' alt='<?php $clang->eT("Delete current user group"); ?>' name='DeleteUserGroup'  /></a>
                 <?php }
                 else