diff options
Diffstat (limited to 'sonar-server')
4 files changed, 3 insertions, 29 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java b/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java index 409deb97f77..3fdcc998ab8 100644 --- a/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java +++ b/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.ServerComponent; import org.sonar.api.security.DefaultGroups; -import org.sonar.api.utils.MessageException; import org.sonar.core.permission.ComponentPermissionFacade; import org.sonar.core.permission.Permission; import org.sonar.core.user.*; @@ -72,12 +71,6 @@ public class InternalPermissionService implements ServerComponent { } } - public void checkAtLeastOneSysAdminExists(){ - if (roleDao.countUserWithPermission(Permission.SYSTEM_ADMIN.key()) == 0){ - throw MessageException.ofL10n("global_permissions.error.need_at_lest_one_admin", null); - } - } - private void applyPermissionTemplate(String templateKey, String componentId) { permissionFacade.applyPermissionTemplate(templateKey, Long.parseLong(componentId)); } diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb index 1105fa5292b..f2d5fd5d878 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb @@ -23,7 +23,7 @@ class GroupsController < ApplicationController before_filter :admin_required def index - @groups = Group.all(:order => 'name') + @groups = Group.find(:all, :order => 'name') if params[:id] @group = Group.find(params[:id]) else @@ -72,7 +72,7 @@ class GroupsController < ApplicationController end def to_index(errors, id) - unless errors.empty? + if !errors.empty? flash[:error] = errors.full_messages.join("<br/>\n") end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb index cf9104cc5e4..d109cf33c44 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb @@ -161,7 +161,7 @@ class UsersController < ApplicationController end def to_index(errors, id) - unless errors.empty? + if !errors.empty? flash[:error] = errors.full_messages.join("<br/>\n") end diff --git a/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java b/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java index bcff818c1cd..6dd2f92fca6 100644 --- a/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java @@ -30,7 +30,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.security.DefaultGroups; -import org.sonar.api.utils.MessageException; import org.sonar.core.permission.ComponentPermissionFacade; import org.sonar.core.permission.Permission; import org.sonar.core.user.*; @@ -41,8 +40,6 @@ import org.sonar.server.user.MockUserSession; import java.util.Map; -import static org.fest.assertions.Assertions.assertThat; -import static org.fest.assertions.Fail.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.*; @@ -194,22 +191,6 @@ public class InternalPermissionServiceTest { verify(permissionFacade).applyPermissionTemplate("my_template_key", 3L); } - @Test - public void should_check_at_least_one_sys_admin_exists() throws Exception { - // One admin exists -> all is ok - when(roleDao.countUserWithPermission(anyString())).thenReturn(1); - service.checkAtLeastOneSysAdminExists(); - - // No admin -> fail - try { - when(roleDao.countUserWithPermission(anyString())).thenReturn(0); - service.checkAtLeastOneSysAdminExists(); - fail(); - } catch (Exception e){ - assertThat(e).isInstanceOf(MessageException.class); - } - } - protected static class MatchesUserRole extends BaseMatcher<UserRoleDto> { private final UserRoleDto referenceDto; |