Commit 716d0864 authored by Piotr Gawron's avatar Piotr Gawron

Merge branch '887-issue-during-upload-found-in-the-log-min-v-14' into 'master'

Resolve "issue during upload, found in the log //min v 14"

Closes #887

See merge request !879
parents 43779e8f 34959b2c
Pipeline #12953 canceled with stage
in 2 minutes and 16 seconds
......@@ -12,8 +12,9 @@ minerva (14.0.0~alpha.1) unstable; urgency=low
loaded plugins (#885)
* Bug fix: link to molart was brokwn (#886)
* Bug fix: context menu visualization fixed
* Bug fix: problem with uploading projects (#887)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 12 Aug 2019 10:00:00 +0200
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 13 Aug 2019 21:00:00 +0200
minerva (14.0.0~alpha.0) unstable; urgency=low
* Feature: security layer redesigned - privilege types and scope changed
......
......@@ -679,7 +679,8 @@ public class ProjectService implements IProjectService {
*/
protected void createModel(final CreateProjectParams params, Project dbProject)
throws InvalidInputDataExecption, ConverterException {
UserAnnotationSchema userAnnotationSchema = params.getUser().getAnnotationSchema();
User dbUser = userDao.getById(params.getUser().getId());
UserAnnotationSchema userAnnotationSchema = dbUser.getAnnotationSchema();
if (userAnnotationSchema == null) {
userAnnotationSchema = new UserAnnotationSchema();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment