Fixed issue: cannot assign a resource to a user who has an organization

CHANGELOG.md

@@ -63,6 +63,7 @@ non-ascii paths while adding files from "Connected file share" (issue #4428)
 - Changing an object causes current z layer to be set to the maximum (<https://github.com/opencv/cvat/pull/5145>)
 - Job assignee can not resolve an issue (<https://github.com/opencv/cvat/pull/5167>)
 - Create manifest with cvat/server docker container command (<https://github.com/opencv/cvat/pull/5172>)
+- Cannot assign a resource to a user who has an organization (<https://github.com/opencv/cvat/pull/5218>)
 
 ### Security
 - TDB

cvat-core/package.json

@@ -1,6 +1,6 @@
 {
  "name": "cvat-core",
- "version": "7.0.2",
+ "version": "7.0.3",
  "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
  "main": "src/api.ts",
  "scripts": {

cvat-core/src/server-proxy.ts

@@ -216,7 +216,15 @@ class ServerProxy {
  return reqConfig;
  }
 
- reqConfig.params = { ...enableOrganization(), ...(reqConfig.params || {}) };
+ const organization = enableOrganization();
+ // for users when organization is unset
+ // we are interested in getting all the users,
+ // not only those who are not in any organization
+ if (reqConfig.url.endsWith('/users') && !organization.org) {
+ return reqConfig;
+ }
+
+ reqConfig.params = { ...organization, ...(reqConfig.params || {}) };
  return reqConfig;
  });