unnecessary privileges removed

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.
 	 */

persist/src/db/11.1.0/fix_db_20170822.sql

+--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

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, //

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);

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:

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.
 	 *