mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-17 01:31:01 +00:00
consolidated UserRoles and Roles
This commit is contained in:
1 parent
021b4a96ac
commit
98dc00dd21
4 files changed
+24
-40
No files matched your search
+14
-14
@@ -1,28 +1,28 @@
|
||||
package com.sap.sailing.gwt.ui.adminconsole;
|
||||
|
||||
import com.sap.sailing.gwt.ui.usermanagement.UserRoles;
|
||||
import com.sap.sailing.gwt.ui.server.security.Roles;
|
||||
import com.sap.sse.gwt.adminconsole.AdminConsoleFeatures;
|
||||
import com.sap.sse.security.shared.DefaultRoles;
|
||||
|
||||
public interface SailingAdminConsoleFeatures {
|
||||
final AdminConsoleFeatures MANAGE_EVENTS = new AdminConsoleFeatures("MANAGE_EVENTS", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_REGATTAS = new AdminConsoleFeatures("MANAGE_REGATTAS", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_TRACKED_RACES = new AdminConsoleFeatures("MANAGE_TRACKED_RACES", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures SHOW_TRACKED_RACES = new AdminConsoleFeatures("SHOW_TRACKED_RACES", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_EVENTS = new AdminConsoleFeatures("MANAGE_EVENTS", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_REGATTAS = new AdminConsoleFeatures("MANAGE_REGATTAS", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_TRACKED_RACES = new AdminConsoleFeatures("MANAGE_TRACKED_RACES", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures SHOW_TRACKED_RACES = new AdminConsoleFeatures("SHOW_TRACKED_RACES", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_RACELOG_TRACKING = new AdminConsoleFeatures("MANAGE_RACELOG_TRACKING", DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_ALL_COMPETITORS = new AdminConsoleFeatures("MANAGE_ALL_COMPETITORS", DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_COURSE_LAYOUT = new AdminConsoleFeatures("MANAGE_COURSE_LAYOUT", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_WIND = new AdminConsoleFeatures("MANAGE_WIND", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_IGTIMI_ACCOUNTS = new AdminConsoleFeatures("MANAGE_IGTIMI_ACCOUNTS", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_LEADERBOARDS = new AdminConsoleFeatures("MANAGE_LEADERBOARDS", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_LEADERBOARD_GROUPS = new AdminConsoleFeatures("MANAGE_LEADERBOARD_GROUPS", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_RESULT_IMPORT_URLS = new AdminConsoleFeatures("MANAGE_RESULT_IMPORT_URLS", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_STRUCTURE_IMPORT_URLS = new AdminConsoleFeatures("MANAGE_STRUCTURE_IMPORT_URLS", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_MEDIA = new AdminConsoleFeatures("MANAGE_MEDIA", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_COURSE_LAYOUT = new AdminConsoleFeatures("MANAGE_COURSE_LAYOUT", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_WIND = new AdminConsoleFeatures("MANAGE_WIND", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_IGTIMI_ACCOUNTS = new AdminConsoleFeatures("MANAGE_IGTIMI_ACCOUNTS", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_LEADERBOARDS = new AdminConsoleFeatures("MANAGE_LEADERBOARDS", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_LEADERBOARD_GROUPS = new AdminConsoleFeatures("MANAGE_LEADERBOARD_GROUPS", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_RESULT_IMPORT_URLS = new AdminConsoleFeatures("MANAGE_RESULT_IMPORT_URLS", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_STRUCTURE_IMPORT_URLS = new AdminConsoleFeatures("MANAGE_STRUCTURE_IMPORT_URLS", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_MEDIA = new AdminConsoleFeatures("MANAGE_MEDIA", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_SAILING_SERVER_INSTANCES = new AdminConsoleFeatures("MANAGE_SAILING_SERVER_INSTANCES", DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_REPLICATION = new AdminConsoleFeatures("MANAGE_REPLICATION", DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_MASTERDATA_IMPORT = new AdminConsoleFeatures("MANAGE_MASTERDATA_IMPORT", DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_DEVICE_CONFIGURATION = new AdminConsoleFeatures("MANAGE_DEVICE_CONFIGURATION", UserRoles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_DEVICE_CONFIGURATION = new AdminConsoleFeatures("MANAGE_DEVICE_CONFIGURATION", Roles.eventmanager.getRolename(), DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_USERS = new AdminConsoleFeatures("MANAGE_USERS", DefaultRoles.ADMIN.getRolename());
|
||||
final AdminConsoleFeatures MANAGE_FILE_STORAGE = new AdminConsoleFeatures("MANAGE_FILE_STORAGE", DefaultRoles.ADMIN.getRolename());
|
||||
}
|
||||
+2
-2
@@ -37,7 +37,7 @@ import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer;
|
||||
import com.sap.sailing.gwt.ui.client.media.shared.VideoSynchPlayer;
|
||||
import com.sap.sailing.gwt.ui.client.shared.components.Component;
|
||||
import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent;
|
||||
import com.sap.sailing.gwt.ui.usermanagement.UserRoles;
|
||||
import com.sap.sailing.gwt.ui.server.security.Roles;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
import com.sap.sse.gwt.client.ErrorReporter;
|
||||
@@ -480,7 +480,7 @@ public class MediaPlayerManagerComponent implements Component<Void>, PlayStateLi
|
||||
final VideoSynchPlayer videoPlayer;
|
||||
final UserDTO currentUser = userService.getCurrentUser();
|
||||
boolean showSynchControls = currentUser != null && (currentUser.hasRole(DefaultRoles.ADMIN.getRolename()) ||
|
||||
currentUser.hasRole(UserRoles.eventmanager.getRolename()) || currentUser.hasRole(UserRoles.mediaeditor.getRolename()));
|
||||
currentUser.hasRole(Roles.eventmanager.getRolename()) || currentUser.hasRole(Roles.mediaeditor.getRolename()));
|
||||
if (videoTrack.isYoutube()) {
|
||||
videoPlayer = new VideoYoutubePlayer(videoTrack, getRaceStartTime(), showSynchControls, raceTimer);
|
||||
} else {
|
||||
|
||||
Executable → Regular
+8
-4
@@ -3,16 +3,20 @@ package com.sap.sailing.gwt.ui.server.security;
|
||||
import com.sap.sse.security.shared.Role;
|
||||
|
||||
public enum Roles implements Role {
|
||||
EVENT_MANAGER("event_manager");
|
||||
|
||||
spectator("spectator"),
|
||||
moderator("moderator"),
|
||||
sailor("sailor"),
|
||||
coach("coach"),
|
||||
eventmanager("eventmanager"),
|
||||
mediaeditor("mediaeditor");
|
||||
|
||||
private Roles(String rolename) {
|
||||
this.rolename = rolename;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRolename() {
|
||||
return rolename;
|
||||
}
|
||||
|
||||
|
||||
private final String rolename;
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
package com.sap.sailing.gwt.ui.usermanagement;
|
||||
|
||||
public enum UserRoles {
|
||||
spectator("spectator"),
|
||||
moderator("moderator"),
|
||||
sailor("sailor"),
|
||||
coach("coach"),
|
||||
eventmanager("eventmanager"),
|
||||
mediaeditor("mediaeditor");
|
||||
|
||||
private UserRoles(String rolename) {
|
||||
this.rolename = rolename;
|
||||
}
|
||||
|
||||
public String getRolename() {
|
||||
return rolename;
|
||||
}
|
||||
|
||||
private final String rolename;
|
||||
}
|
||||
Reference in new issue
Block a user