public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-13 01:36:18 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
bgamard
2020-08-28 17:34:03 +02:00
parent 42e61d6e1f 2bf3e6bd3c
commit e1fa17691d
12 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs-web/src/main/java/com/sismics/docs/rest/resource/RouteResource.java
View File

@@ -209,7 +209,9 @@ public class RouteResource extends BaseResource {
routeStepDao.endRouteStep(routeStepDto.getId(), routeStepTransition, comment, principal.getId());
RouteStepDto newRouteStep = routeStepDao.getCurrentStep(documentId);
RoutingUtil.updateAcl(documentId, newRouteStep, routeStepDto, principal.getId());
RoutingUtil.sendRouteStepEmail(documentId, routeStepDto);
if (newRouteStep != null) {
RoutingUtil.sendRouteStepEmail(documentId, newRouteStep);
}
JsonObjectBuilder response = Json.createObjectBuilder()
.add("readable", aclDao.checkPermission(documentId, PermType.READ, getTargetIdList(null)));

3
docs-web/src/main/webapp/src/app/docs/app.js
View File

@@ -527,7 +527,8 @@ angular.module('docs',
{ key: 'hun', label: 'Magyar' },
{ key: 'fin', label: 'Suomi' },
{ key: 'swe', label: 'Svenska' },
{ key: 'lav', label: 'Latviešu' }
{ key: 'lav', label: 'Latviešu' },
{ key: 'dan', label: 'Dansk' }
];
})
/**

2
docs-web/src/test/java/com/sismics/docs/rest/TestRouteResource.java
View File

@@ -226,7 +226,7 @@ public class TestRouteResource extends BaseJerseyTest {
.param("transition", "APPROVED")), JsonObject.class);
Assert.assertFalse(json.containsKey("route_step"));
Assert.assertTrue(json.getBoolean("readable")); // Admin can read everything
Assert.assertTrue(popEmail().contains("workflow step"));
Assert.assertNull(popEmail()); // Last step does not send any email
// Get the route on document 1
json = target().path("/route")