diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LocalServerManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LocalServerManagementPanel.java index dea5d20391c..691b86a1093 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LocalServerManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LocalServerManagementPanel.java @@ -36,7 +36,6 @@ import com.sap.sse.security.ui.client.component.EditOwnershipDialog; import com.sap.sse.security.ui.client.component.editacl.EditACLDialog; public class LocalServerManagementPanel extends SimplePanel { - private final SailingServiceAsync sailingService; private final ErrorReporter errorReporter; private final StringMessages stringMessages; @@ -88,10 +87,8 @@ public class LocalServerManagementPanel extends SimplePanel { .create(userService.getUserManagementWriteService(), type, updateCallback, stringMessages); final EditACLDialog.DialogConfig configACL = EditACLDialog .create(userService.getUserManagementWriteService(), type, updateCallback, stringMessages); - final Predicate permissionCheck = action -> currentServerInfo != null && userService.hasPermission(type.getPermission(action), currentServerInfo.getOwnership()); - final AccessControlledButtonPanel buttonPanel = new AccessControlledButtonPanel(userService, type); buttonPanel.addAction(stringMessages.actionChangeOwnership(), () -> permissionCheck.test(CHANGE_OWNERSHIP), () -> configOwner.openOwnershipDialog(currentServerInfo)); @@ -129,7 +126,6 @@ public class LocalServerManagementPanel extends SimplePanel { final ServerConfigurationDTO serverConfig = new ServerConfigurationDTO(isStandaloneServerCheckbox.getValue(), publicServer, selfServiceServer, null); isSelfServiceServerCheckbox.getElement().setAttribute("updating", "true"); - sailingService.updateServerConfiguration(serverConfig, new AsyncCallback() { @Override public void onFailure(Throwable caught) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index 6df634ce034..cc2c346597c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -3980,7 +3980,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet } @Override - //?? + // FIXME See bug 5569: this shall move to SailingServiceWriteImpl public void updateServerConfiguration(ServerConfigurationDTO serverConfiguration) { getSecurityService().checkCurrentUserServerPermission(ServerActions.CONFIGURE_LOCAL_SERVER); getService().apply(new UpdateServerConfiguration( @@ -4010,7 +4010,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet && getSecurityService().hasCurrentUserMetaPermissionsOfRoleDefinitionWithQualification( viewerRole, new Ownership(null, serverGroup))) { if (serverConfiguration.isPublic()) { - getSecurityService().putRoleDefinitionToUserGroup(serverGroup, viewerRole, true); + getSecurityService().putRoleDefinitionToUserGroup(serverGroup, viewerRole, /* forAll */ true); } else { getSecurityService().removeRoleDefintionFromUserGroup(serverGroup, viewerRole); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java index aafa19b9e4f..74cf7eb39b6 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java @@ -239,8 +239,8 @@ public class Activator implements BundleActivator { } if (securityService.isInitialOrMigration()) { // sailing_viewer role is publicly readable - securityService.addToAccessControlList(sailingViewerRoleDefinition.getIdentifier(), - null, DefaultActions.READ.name()); + securityService.addToAccessControlList(sailingViewerRoleDefinition.getIdentifier(), + null, DefaultActions.READ.name()); } }, null)); final TrackedRaceStatisticsCache trackedRaceStatisticsCache = new TrackedRaceStatisticsCacheImpl();