From 056b8594b9052e13c2e0ab39ea6543913f0f3612 Mon Sep 17 00:00:00 2001
From: Thomas Schnaak <schnaak@uni-potsdam.de>
Date: Thu, 28 Jun 2018 15:28:08 +0200
Subject: [PATCH] fix: rename Visibility none
---
.../unipotsdam/gf/modules/journal/model/Visibility.java | 2 +-
.../gf/modules/journal/service/DummyJournalService.java | 6 +++---
gemeinsamforschen/src/main/webapp/pages/createJournal.jsp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
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 4d924888..ce31ce30 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 84550ecc..7190aad4 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 8faec113..f1deb4e9 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>
--
GitLab