Skip to content
This repository has been archived by the owner on Feb 23, 2018. It is now read-only.

Commit

Permalink
#17 works
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-conway committed Nov 30, 2017
1 parent ac3e857 commit 5d20e8e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ public void setPassword(String password) {

@Override
public String toString() {
final int maxLen = 10;
StringBuilder builder = new StringBuilder();
builder.append("DataGridUser [");
if (id != null) {
Expand Down Expand Up @@ -499,10 +498,10 @@ public String toString() {
}
builder.append("advancedView=").append(advancedView).append(", ");
if (bookmarks != null) {
builder.append("bookmarks=").append(bookmarks.toString()).append(", ");
builder.append("bookmarks=").append(bookmarks).append(", ");
}
if (favorites != null) {
builder.append("favorites=").append(favorites.toString());
builder.append("favorites=").append(favorites);
}
builder.append("]");
return builder.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,6 @@ public String toString() {
if (id != null) {
builder.append("id=").append(id).append(", ");
}
if (user != null) {
builder.append("user=").append(user).append(", ");
}
if (path != null) {
builder.append("path=").append(path).append(", ");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,11 @@ public void setTicketsEnabled(boolean ticketsEnabled) {
this.ticketsEnabled = ticketsEnabled;
}

@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("GlobalConfig [ticketsEnabled=").append(ticketsEnabled).append("]");
return builder.toString();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class PreferencesController {

@RequestMapping(value = "/")
public String index(final Model model, final HttpServletRequest request) {
logger.info("index()");
DataGridUser loggedUser = loggedUserUtils.getLoggedDataGridUser();
String locale = loggedUser.getLocale();

Expand All @@ -77,6 +78,7 @@ public String index(final Model model, final HttpServletRequest request) {
UserPreferences userPreferences = new UserPreferences();
userPreferences.setLocaleLanguage(locale);
userPreferences.setForceFileOverwriting(loggedUser.isForceFileOverwriting());
userPreferences.setAdvancedView(loggedUser.isAdvancedView());

model.addAttribute("preferences", userPreferences);
model.addAttribute("uiMode", uiMode);
Expand Down

0 comments on commit 5d20e8e

Please sign in to comment.