diff --git a/commafeed-client/src/app/types.ts b/commafeed-client/src/app/types.ts index 37bf7434..4b7a3080 100644 --- a/commafeed-client/src/app/types.ts +++ b/commafeed-client/src/app/types.ts @@ -230,7 +230,6 @@ export interface Settings { readingOrder: ReadingOrder showRead: boolean scrollMarks: boolean - theme?: string customCss?: string scrollSpeed: number sharingSettings: SharingSettings diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java b/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java index 40e57b11..958395dc 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java @@ -46,19 +46,12 @@ public class UserSettings extends AbstractModel { @Column(nullable = false) private ReadingOrder readingOrder; - @Enumerated(EnumType.STRING) - @Column(nullable = false) - private ViewMode viewMode; - @Column(name = "user_lang", length = 4) private String language; private boolean showRead; private boolean scrollMarks; - @Column(length = 32) - private String theme; - @Lob @Column(length = Integer.MAX_VALUE) @Type(type = "org.hibernate.type.TextType") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java index b416455f..f44538ea 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java @@ -20,18 +20,12 @@ public class Settings implements Serializable { @ApiModelProperty(value = "user reads entries in ascending or descending order", allowableValues = "asc,desc", required = true) private String readingOrder; - @ApiModelProperty(value = "user viewing mode, either title-only or expande view", allowableValues = "title,expanded", required = true) - private String viewMode; - @ApiModelProperty(value = "user wants category and feeds with no unread entries shown", required = true) private boolean showRead; @ApiModelProperty(value = "In expanded view, scroll through entries mark them as read", required = true) private boolean scrollMarks; - @ApiModelProperty(value = "user's selected theme") - private String theme; - @ApiModelProperty(value = "user's custom css for the website") private String customCss; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java index e8a1ea20..47ff2d81 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java @@ -39,7 +39,6 @@ import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.model.UserSettings; import com.commafeed.backend.model.UserSettings.ReadingMode; import com.commafeed.backend.model.UserSettings.ReadingOrder; -import com.commafeed.backend.model.UserSettings.ViewMode; import com.commafeed.backend.service.MailService; import com.commafeed.backend.service.PasswordEncryptionService; import com.commafeed.backend.service.UserService; @@ -88,7 +87,6 @@ public class UserREST { if (settings != null) { s.setReadingMode(settings.getReadingMode().name()); s.setReadingOrder(settings.getReadingOrder().name()); - s.setViewMode(settings.getViewMode().name()); s.setShowRead(settings.isShowRead()); s.getSharingSettings().setEmail(settings.isEmail()); @@ -101,16 +99,13 @@ public class UserREST { s.getSharingSettings().setBuffer(settings.isBuffer()); s.setScrollMarks(settings.isScrollMarks()); - s.setTheme(settings.getTheme()); s.setCustomCss(settings.getCustomCss()); s.setLanguage(settings.getLanguage()); s.setScrollSpeed(settings.getScrollSpeed()); } else { s.setReadingMode(ReadingMode.unread.name()); s.setReadingOrder(ReadingOrder.desc.name()); - s.setViewMode(ViewMode.title.name()); s.setShowRead(true); - s.setTheme("default"); s.getSharingSettings().setEmail(true); s.getSharingSettings().setGmail(true); @@ -144,9 +139,7 @@ public class UserREST { s.setReadingMode(ReadingMode.valueOf(settings.getReadingMode())); s.setReadingOrder(ReadingOrder.valueOf(settings.getReadingOrder())); s.setShowRead(settings.isShowRead()); - s.setViewMode(ViewMode.valueOf(settings.getViewMode())); s.setScrollMarks(settings.isScrollMarks()); - s.setTheme(settings.getTheme()); s.setCustomCss(settings.getCustomCss()); s.setLanguage(settings.getLanguage()); s.setScrollSpeed(settings.getScrollSpeed()); diff --git a/commafeed-server/src/main/resources/changelogs/db.changelog-3.2.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-3.2.xml new file mode 100644 index 00000000..456affb2 --- /dev/null +++ b/commafeed-server/src/main/resources/changelogs/db.changelog-3.2.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/commafeed-server/src/main/resources/migrations.xml b/commafeed-server/src/main/resources/migrations.xml index a71e8664..166cda0a 100644 --- a/commafeed-server/src/main/resources/migrations.xml +++ b/commafeed-server/src/main/resources/migrations.xml @@ -1,21 +1,22 @@ - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + + + + + + + + + + + + + + + + - - - - - - - - - - \ No newline at end of file