diff --git a/src/Project/Controllers/ProjectController.cs b/src/Project/Controllers/ProjectController.cs index 071556cf71b4db18a93e3e0c8a0d52c2163ee348..2c330b28add081176fece3aaa85ab99e90a2e0c0 100644 --- a/src/Project/Controllers/ProjectController.cs +++ b/src/Project/Controllers/ProjectController.cs @@ -543,8 +543,7 @@ namespace Coscine.Api.Project.Controllers var project = _projectModel.StoreFromObject(projectObject, user, isRWTHMember); - if (projectObject.ParentId != null - && projectObject.ParentId != new Guid() + if (projectObject.ParentId != new Guid() // for now, only an owner can add subprojects to projects && _projectModel.HasAccess(user, _projectModel.GetById(projectObject.ParentId), UserRoles.Owner)) { diff --git a/src/Project/Controllers/SearchController.cs b/src/Project/Controllers/SearchController.cs index c8fd29025129f390625cd303be10e4a8c72728af..a14435ed3286f7874756925ac804134e4a3c9377 100644 --- a/src/Project/Controllers/SearchController.cs +++ b/src/Project/Controllers/SearchController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Web; using Coscine.ApiCommons; -using LinqToDB.Tools; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -203,11 +202,11 @@ namespace Coscine.Api.Project.Controllers from jpi in joinedPi.DefaultIfEmpty() where p.Deleted == false && - ((!showSubProjects && p.Id.NotIn(allSubProjectsList)) || - (showSubProjects && p.Id.In(allSubProjectsList))) && - (jpr.UserId.Equals(userId) || jv.DisplayName.Equals("Public")) && - (projectId.Equals("") || p.Id.In(listOfSubprojects)) && - (searchQuery.Equals("") || + ((!showSubProjects && !allSubProjectsList.Contains(p.Id)) || + (showSubProjects && allSubProjectsList.Contains(p.Id))) && + (jpr.UserId == userId || jv.DisplayName == "Public") && + (projectId == "" || listOfSubprojects.Contains(p.Id)) && + (searchQuery == "" || p.ProjectName.Contains(searchQuery) || p.Description.Contains(searchQuery) || p.Keywords.Contains(searchQuery) || @@ -256,9 +255,9 @@ namespace Coscine.Api.Project.Controllers from jrt in joinedRt.DefaultIfEmpty() where jp.Deleted == false && - (jpr.UserId.Equals(userId) || jv.DisplayName.Equals("Public")) && - (projectId.Equals("") || jp.Id.In(listOfSubprojects)) && - (searchQuery.Equals("") || + (jpr.UserId == userId || jv.DisplayName == "Public") && + (projectId == "" || listOfSubprojects.Contains(jd.Id)) && + (searchQuery == "" || r.ResourceName.Contains(searchQuery) || r.DisplayName.Contains(searchQuery) || r.ResourceName.Contains(searchQuery) ||