diff --git a/model/src/main/java/lcsb/mapviewer/model/user/PrivilegeType.java b/model/src/main/java/lcsb/mapviewer/model/user/PrivilegeType.java index 04af0ffb93367416a9fe4754f14dc633f8a9ab42..2ae29adda5813df28b312c1290c906098976040a 100644 --- a/model/src/main/java/lcsb/mapviewer/model/user/PrivilegeType.java +++ b/model/src/main/java/lcsb/mapviewer/model/user/PrivilegeType.java @@ -21,21 +21,11 @@ public enum PrivilegeType { */ ADD_MAP(BasicPrivilege.class, null, "Add project"), - /** - * User can edit data mining information in the project. - */ - EDIT_MISSING_CONNECTIONS_PROJECT(ObjectPrivilege.class, Project.class, "Edit suggested connections"), - /** * User can edit comments in the project. */ EDIT_COMMENTS_PROJECT(ObjectPrivilege.class, Project.class, "Manage comments"), - /** - * User has access to advanced drug targeting info. - */ - DRUG_TARGETING_ADVANCED_VIEW_PROJECT(ObjectPrivilege.class, Project.class, "Drug targeting advanced view"), - /** * User can manage projects. */ diff --git a/persist/src/db/11.1.0/fix_db_20170822.sql b/persist/src/db/11.1.0/fix_db_20170822.sql new file mode 100644 index 0000000000000000000000000000000000000000..1bcbdea005fa6bf98870b17c2b7c205dccd4c7bf --- /dev/null +++ b/persist/src/db/11.1.0/fix_db_20170822.sql @@ -0,0 +1,3 @@ +--unnecessery privileges removed +delete from privilege_table where type='DRUG_TARGETING_ADVANCED_VIEW_PROJECT' ; +delete from privilege_table where type='EDIT_MISSING_CONNECTIONS_PROJECT' ; \ No newline at end of file diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java b/rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java index ce3881563876e577b9716388e8e8d038a8a89347..afc96827ab2a577f4c8651e09ab80379f82ad89e 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java @@ -91,7 +91,7 @@ public class UserController extends BaseController { return userRest.getUsers(token, columns); } - @RequestMapping(value = "/users/{login}:updatePrivileges", method = { RequestMethod.POST }, produces = { MediaType.APPLICATION_JSON_VALUE }) + @RequestMapping(value = "/users/{login}:updatePrivileges", method = { RequestMethod.PATCH }, produces = { MediaType.APPLICATION_JSON_VALUE }) public Map<String, Object> updatePrivileges(// @RequestBody String body, // @CookieValue(value = Configuration.AUTH_TOKEN) String token, // diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java index 4ed367e981ce3ef02b7f1dfba436b8ecf21e194c..9739b285c9e7e2b647ab03b5b3f403f906af63d5 100644 --- a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java +++ b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java @@ -586,7 +586,7 @@ public class ProjectService implements IProjectService { ObjectPrivilege privilege = new ObjectPrivilege(project, 1, PrivilegeType.VIEW_PROJECT, user); userService.setUserPrivilege(user, privilege); if (admin) { - privilege = new ObjectPrivilege(project, 1, PrivilegeType.EDIT_MISSING_CONNECTIONS_PROJECT, user); + privilege = new ObjectPrivilege(project, 1, PrivilegeType.LAYOUT_MANAGEMENT, user); userService.setUserPrivilege(user, privilege); privilege = new ObjectPrivilege(project, 1, PrivilegeType.EDIT_COMMENTS_PROJECT, user); userService.setUserPrivilege(user, privilege); diff --git a/web/src/main/java/lcsb/mapviewer/bean/MapBean.java b/web/src/main/java/lcsb/mapviewer/bean/MapBean.java index f96515e249fd1a776e82eb13f2fd61f3349f6fdd..d8c6f2d8d8ebf90c7f09148860a4c804f208f192 100644 --- a/web/src/main/java/lcsb/mapviewer/bean/MapBean.java +++ b/web/src/main/java/lcsb/mapviewer/bean/MapBean.java @@ -563,19 +563,6 @@ public class MapBean extends AbstractManagedBean implements Serializable { return result; } - /** - * Check if user can edit connections. - * - * @return <i>true</i> if user can edit connections,<br/> - * <i> false otherwise</i> - */ - public boolean getUserHasEditMissingConnection() { - Project project = getCurrentProject(); - User user = userBean.getLoggedUser(); - boolean result = userService.userHasPrivilege(user, PrivilegeType.EDIT_MISSING_CONNECTIONS_PROJECT, project); - return result; - } - /** * This is artifitial method called by the client side to pass some parameters * to the bean: diff --git a/web/src/main/java/lcsb/mapviewer/bean/SearchBean.java b/web/src/main/java/lcsb/mapviewer/bean/SearchBean.java index eca49cfa67c60b1137f03b29e2265ce03c24e0de..012985286262fda410348e98d18e6a380fbb9a79 100644 --- a/web/src/main/java/lcsb/mapviewer/bean/SearchBean.java +++ b/web/src/main/java/lcsb/mapviewer/bean/SearchBean.java @@ -336,19 +336,6 @@ public class SearchBean extends AbstractMarkerManagerBean<SearchElementResult> i } } - /** - * Check if user can edit connections. - * - * @return <i>true</i> if user can edit connections,<br/> - * <i>false</i> otherwise - */ - public boolean getUserHasEditMissingConnection() { - Project project = getCurrentProject(); - User user = userBean.getLoggedUser(); - boolean result = userService.userHasPrivilege(user, PrivilegeType.EDIT_MISSING_CONNECTIONS_PROJECT, project); - return result; - } - /** * Returns list of autocomple strings for the string query. *