user setting for showing or hiding 'empty' categories and feeds

This commit is contained in:
Athou
2013-04-12 09:57:18 +02:00
parent 38c58fcf64
commit 65552294cc
7 changed files with 48 additions and 11 deletions

View File

@@ -34,6 +34,8 @@ public class UserSettings extends AbstractModel {
@Column(nullable = false)
private ReadingOrder readingOrder;
private boolean showRead;
@Lob
@Column(length = Integer.MAX_VALUE)
private String customCss;
@@ -70,4 +72,12 @@ public class UserSettings extends AbstractModel {
this.readingOrder = readingOrder;
}
public boolean isShowRead() {
return showRead;
}
public void setShowRead(boolean showRead) {
this.showRead = showRead;
}
}

View File

@@ -7,6 +7,7 @@ public class Settings implements Serializable {
private String readingMode;
private String readingOrder;
private boolean showRead;
private String customCss;
public String getReadingMode() {
@@ -33,4 +34,12 @@ public class Settings implements Serializable {
this.readingOrder = readingOrder;
}
public boolean isShowRead() {
return showRead;
}
public void setShowRead(boolean showRead) {
this.showRead = showRead;
}
}

View File

@@ -23,10 +23,12 @@ public class SettingsREST extends AbstractREST {
if (settings != null) {
s.setReadingMode(settings.getReadingMode().name());
s.setReadingOrder(settings.getReadingOrder().name());
s.setShowRead(settings.isShowRead());
s.setCustomCss(settings.getCustomCss());
} else {
s.setReadingMode(ReadingMode.unread.name());
s.setReadingOrder(ReadingOrder.desc.name());
s.setShowRead(true);
}
return s;
}
@@ -43,6 +45,7 @@ public class SettingsREST extends AbstractREST {
}
s.setReadingMode(ReadingMode.valueOf(settings.getReadingMode()));
s.setReadingOrder(ReadingOrder.valueOf(settings.getReadingOrder()));
s.setShowRead(settings.isShowRead());
s.setCustomCss(settings.getCustomCss());
userSettingsDAO.saveOrUpdate(s);
return Response.ok(Status.OK).build();