Fixed issue #13062: Survey permissions - display issues - users & use…

…r groups
LimeSurvey · Dec 21, 2017 · 7462f67 · 7462f67
1 parent acd6706
commit 7462f67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/application/controllers/admin/surveypermission.php b/application/controllers/admin/surveypermission.php
@@ -394,7 +394,7 @@ function adduser($surveyid)
                 $this->getController()->error('Access denied');
             }
 
-            $addsummary .= "</div></div></div>\n";
+            $addsummary .= "</div></div>\n";
 
             $aViewUrls['output'] = $addsummary;
         }
@@ -510,7 +510,7 @@ function set($surveyid)
             } else {
                 $usersummary .= "<input type='hidden' name='ugid' value='{$postusergroupid}' />";
             }
-            $usersummary .= "</form></div></div>\n";
+            $usersummary .= "</form>\n";
 
             $aViewUrls['output'] = $usersummary;
         } else {
@@ -574,7 +574,7 @@ function delete($surveyid)
             } else {
                 $this->getController()->error('Access denied');
             }
-            $addsummary .= "</div></div></div>\n";
+            $addsummary .= "</div></div>\n";
 
             $aViewUrls['output'] = $addsummary;
         }

diff --git a/application/models/User.php b/application/models/User.php
@@ -410,7 +410,8 @@ class='btn btn-default btn-xs'>
                         data-message='".gT("Do you want to delete this user?")."'
                         class='btn btn-default btn-xs '>
                             <span class='fa fa-trash  text-danger'></span>
-                        </button>";
+                        </button>
+                    </span>";
                     }
                 if (Permission::isForcedSuperAdmin(Yii::app()->session['loginID'])
                     && $this->parent_id != Yii::app()->session['loginID']