diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Visibility.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Visibility.java index 4d9248881006fbac31f6f4d01e2c6dfdc9f7775e..ce31ce305802ac036a27a2d452ee86926aac472f 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Visibility.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Visibility.java @@ -1,4 +1,4 @@ package unipotsdam.gf.modules.journal.model; -public enum Visibility { ALL, GROUP, DOZENT, NONE +public enum Visibility { ALL, GROUP, DOZENT, MINE } diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java index 84550ecc55f7ce5e8124b2b907002a6542329e70..7190aad479489b845eae9dc995d89b842fba3695 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java @@ -117,8 +117,8 @@ public class DummyJournalService implements JournalService { try{ v = Visibility.valueOf(visibility); }catch (IllegalArgumentException e){ - v = Visibility.NONE; - log.debug("Illegal argument for visibility, default to NONE"); + v = Visibility.MINE; + log.debug("Illegal argument for visibility, default to MINE"); } return v; } @@ -132,7 +132,7 @@ public class DummyJournalService implements JournalService { Journal j1 = new Journal(0,studentIdentifier,test, cal.getTimeInMillis() , Visibility.ALL, "test1"); j1.setCreator("Test Test"); - Journal j2 = new Journal(1,studentIdentifier,test, cal.getTimeInMillis() , Visibility.NONE, "test2"); + Journal j2 = new Journal(1,studentIdentifier,test, cal.getTimeInMillis() , Visibility.MINE, "test2"); j2.setCreator("Test Test"); Journal j3 = new Journal(2,studentIdentifier,test, cal.getTimeInMillis() , Visibility.GROUP, "test3"); j3.setCreator("Test Test"); diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp index 8faec1139ed46954ab0b6c9c0c0ae534170fce51..f1deb4e925f3dfd77d71f00603cb2a87d4675692 100644 --- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp @@ -55,7 +55,7 @@ <option value="ALL"> Alle </option> <option value="GROUP"> Gruppe </option> <option value="DOZENT"> Dozent </option> - <option value="NONE"> Niemand </option> + <option value="NONE"> Nur Ich </option> </select> </div>