Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • getFacilities
  • get_facilities
  • main
  • makub/runnable_jar
  • mastalir/fix_ci
  • renovate/angular-cli-monorepo
  • renovate/angular-eslint-monorepo
  • renovate/angular-monorepo
  • renovate/angularmaterial-monorepo
  • renovate/bootstrap-5.x
  • renovate/core-js-3.x
  • renovate/lock-file-maintenance
  • renovate/node-16.x
  • renovate/nrwl-monorepo
  • session
  • zlamalp/test
  • zlamalp/testbuild
  • v0.1.0
  • v0.2.0
  • v0.2.1
  • v1.0.0
  • v1.0.1
  • v1.0.2
  • v1.0.3
  • v1.1.0
  • v1.2.0
  • v1.2.1
  • v1.2.2
  • v1.2.3
  • v1.2.4
  • v1.2.5
  • v1.2.6
  • v1.3.0
  • v1.3.1
  • v1.3.10
  • v1.3.11
  • v1.3.12
  • v1.3.13
  • v1.3.14
  • v1.3.15
  • v1.3.16
  • v1.3.17
  • v1.3.18
  • v1.3.19
  • v1.3.2
  • v1.3.20
  • v1.3.21
  • v1.3.22
  • v1.3.23
  • v1.3.24
  • v1.3.25
  • v1.3.26
  • v1.3.27
  • v1.3.28
  • v1.3.29
  • v1.3.3
  • v1.3.30
  • v1.3.31
  • v1.3.32
  • v1.3.33
  • v1.3.34
  • v1.3.35
  • v1.3.36
  • v1.3.4
  • v1.3.5
  • v1.3.6
  • v1.3.7
  • v1.3.8
  • v1.3.9
  • v2.0.0
  • v2.0.1
  • v2.0.10
  • v2.0.11
  • v2.0.12
  • v2.0.2
  • v2.0.3
  • v2.0.4
  • v2.0.5
  • v2.0.6
  • v2.0.7
  • v2.0.8
  • v2.0.9
  • v2.1.0
  • v2.1.1
  • v2.1.10
  • v2.1.11
  • v2.1.12
  • v2.1.2
  • v2.1.3
  • v2.1.4
  • v2.1.5
  • v2.1.6
  • v2.1.7
  • v2.1.8
  • v2.1.9
  • v3.0.0
  • v3.0.1
  • v3.0.10
  • v3.0.11
  • v3.0.12
  • v3.0.13
  • v3.0.14
  • v3.0.15
  • v3.0.16
  • v3.0.17
  • v3.0.18
  • v3.0.19
  • v3.0.2
  • v3.0.20
  • v3.0.21
  • v3.0.22
  • v3.0.23
  • v3.0.24
  • v3.0.25
  • v3.0.26
  • v3.0.27
  • v3.0.28
117 results

Target

Select target project
  • perun/perun-proxyidp/v1/perun-spRegistration-app
1 result
Select Git revision
  • getFacilities
  • get_facilities
  • main
  • makub/runnable_jar
  • mastalir/fix_ci
  • renovate/angular-cli-monorepo
  • renovate/angular-eslint-monorepo
  • renovate/angular-monorepo
  • renovate/angularmaterial-monorepo
  • renovate/bootstrap-5.x
  • renovate/core-js-3.x
  • renovate/lock-file-maintenance
  • renovate/node-16.x
  • renovate/nrwl-monorepo
  • session
  • zlamalp/test
  • zlamalp/testbuild
  • v0.1.0
  • v0.2.0
  • v0.2.1
  • v1.0.0
  • v1.0.1
  • v1.0.2
  • v1.0.3
  • v1.1.0
  • v1.2.0
  • v1.2.1
  • v1.2.2
  • v1.2.3
  • v1.2.4
  • v1.2.5
  • v1.2.6
  • v1.3.0
  • v1.3.1
  • v1.3.10
  • v1.3.11
  • v1.3.12
  • v1.3.13
  • v1.3.14
  • v1.3.15
  • v1.3.16
  • v1.3.17
  • v1.3.18
  • v1.3.19
  • v1.3.2
  • v1.3.20
  • v1.3.21
  • v1.3.22
  • v1.3.23
  • v1.3.24
  • v1.3.25
  • v1.3.26
  • v1.3.27
  • v1.3.28
  • v1.3.29
  • v1.3.3
  • v1.3.30
  • v1.3.31
  • v1.3.32
  • v1.3.33
  • v1.3.34
  • v1.3.35
  • v1.3.36
  • v1.3.4
  • v1.3.5
  • v1.3.6
  • v1.3.7
  • v1.3.8
  • v1.3.9
  • v2.0.0
  • v2.0.1
  • v2.0.10
  • v2.0.11
  • v2.0.12
  • v2.0.2
  • v2.0.3
  • v2.0.4
  • v2.0.5
  • v2.0.6
  • v2.0.7
  • v2.0.8
  • v2.0.9
  • v2.1.0
  • v2.1.1
  • v2.1.10
  • v2.1.11
  • v2.1.12
  • v2.1.2
  • v2.1.3
  • v2.1.4
  • v2.1.5
  • v2.1.6
  • v2.1.7
  • v2.1.8
  • v2.1.9
  • v3.0.0
  • v3.0.1
  • v3.0.10
  • v3.0.11
  • v3.0.12
  • v3.0.13
  • v3.0.14
  • v3.0.15
  • v3.0.16
  • v3.0.17
  • v3.0.18
  • v3.0.19
  • v3.0.2
  • v3.0.20
  • v3.0.21
  • v3.0.22
  • v3.0.23
  • v3.0.24
  • v3.0.25
  • v3.0.26
  • v3.0.27
  • v3.0.28
117 results
Show changes
Commits on Source (5)
## [5.0.5](https://gitlab.ics.muni.cz/perun-proxy-aai/java/perun-spRegistration-app/compare/v5.0.4...v5.0.5) (2023-04-11)
### Bug Fixes
* 🐛 Enable request rejection in approval process ([052bdd5](https://gitlab.ics.muni.cz/perun-proxy-aai/java/perun-spRegistration-app/commit/052bdd50f3d171ebe2da44ffb4f6c233b785261a))
## [5.0.4](https://gitlab.ics.muni.cz/perun-proxy-aai/java/perun-spRegistration-app/compare/v5.0.3...v5.0.4) (2023-04-11)
......
......@@ -47,7 +47,7 @@
"@angular/language-service": "14.2.12",
"@nrwl/eslint-plugin-nx": "14.8.8",
"@nrwl/workspace": "14.8.8",
"@types/node": "18.15.3",
"@types/node": "18.15.11",
"@typescript-eslint/eslint-plugin": "5.55.0",
"@typescript-eslint/parser": "5.55.0",
"eslint": "8.36.0",
......@@ -58,7 +58,7 @@
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-promise": "6.1.1",
"nx": "15.0.13",
"prettier": "2.8.4",
"prettier": "2.8.7",
"typescript": "4.8.4"
}
},
......@@ -6263,9 +6263,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"node_modules/@types/node": {
"version": "18.15.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
"integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw=="
"version": "18.15.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
"integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
......@@ -17726,9 +17726,9 @@
}
},
"node_modules/prettier": {
"version": "2.8.4",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
"integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
"version": "2.8.7",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
"integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
"devOptional": true,
"bin": {
"prettier": "bin-prettier.js"
......@@ -25240,9 +25240,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"@types/node": {
"version": "18.15.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
"integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw=="
"version": "18.15.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
"integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
},
"@types/parse-json": {
"version": "4.0.0",
......@@ -33351,9 +33351,9 @@
"devOptional": true
},
"prettier": {
"version": "2.8.4",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
"integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
"version": "2.8.7",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
"integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
"devOptional": true
},
"prettier-linter-helpers": {
......@@ -54,7 +54,7 @@
"@angular/language-service": "14.2.12",
"@nrwl/eslint-plugin-nx": "14.8.8",
"@nrwl/workspace": "14.8.8",
"@types/node": "18.15.3",
"@types/node": "18.15.11",
"@typescript-eslint/eslint-plugin": "5.55.0",
"@typescript-eslint/parser": "5.55.0",
"eslint": "8.36.0",
......@@ -65,7 +65,7 @@
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-promise": "6.1.1",
"nx": "15.0.13",
"prettier": "2.8.4",
"prettier": "2.8.7",
"typescript": "4.8.4"
}
}
......@@ -12,7 +12,7 @@
<groupId>cz.metacentrum.perun</groupId>
<artifactId>spRegistration</artifactId>
<version>5.0.4</version>
<version>5.0.5</version>
<packaging>war</packaging>
<name>perun-spRegistration</name>
......
......@@ -470,12 +470,12 @@ public class RequestsServiceImpl implements RequestsService {
RequestDTO request = requestManager.getRequestById(requestId);
if (request == null) {
throw new InternalErrorException("Could not fetch request with ID: " + requestId + " from database");
} else if (!hasCorrectStatus(request.getStatus(), new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES})) {
} else if (!hasCorrectStatus(request.getStatus(),
new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES, IN_APPROVAL_PROCESS})
) {
throw new CannotChangeStatusException("Cannot reject request, request is not in valid status");
}
RequestStatus oldStatus = request.getStatus();
request.setStatus(REJECTED);
request.setModifiedAt(new Timestamp(System.currentTimeMillis()));
request.setModifiedBy(user.getId());
......@@ -496,12 +496,10 @@ public class RequestsServiceImpl implements RequestsService {
RequestDTO request = requestManager.getRequestById(requestId);
if (request == null) {
throw new InternalErrorException("Could not fetch request with ID: " + requestId + " from database");
} else if (!hasCorrectStatus(request.getStatus(), new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES})) {
} else if (!hasCorrectStatus(request.getStatus(), new RequestStatus[] {WAITING_FOR_APPROVAL, WAITING_FOR_CHANGES, IN_APPROVAL_PROCESS})) {
throw new CannotChangeStatusException("Cannot ask for changes, request not marked as WFA nor WFC");
}
RequestStatus oldStatus = request.getStatus();
request.updateAttributes(attributes, false, applicationBeans);
request.setStatus(WAITING_FOR_CHANGES);
request.setModifiedBy(user.getId());
......