Skip to content

dev to main 1.4 #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
F0rgiv wants to merge 4 commits into
base: main
Choose a base branch
from
Open

dev to main 1.4 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f64924a
get rid of logs for user image set and retrieve
wordhou Apr 23, 2021
34dacab
Updating description doesn't nullify title and vice versa
wordhou Apr 23, 2021
40179d2
Merge pull request #139 from islands-collaborative/get-rid-of-debug-l…
F0rgiv Apr 23, 2021
cc3fd4c
Merge pull request #140 from islands-collaborative/fix-post-edit-bug-…
F0rgiv Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/islandcollaborative/creativeexchange/controllers/PostController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public RedirectView addPost(HttpServletRequest request, String text, String titl
@PutMapping("/posts/{postId}")
public RedirectView updatePosts(@PathVariable long postId, String text, String title) {
Post post = postRepository.getOne(postId);
post.setText(text);
post.setTitle(title);
if (text != null && !text.isBlank()) post.setText(text);
if (title != null && !title.isBlank()) post.setTitle(title);
postRepository.save(post);
return new RedirectView("/posts/" + postId + "/edit");
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/islandcollaborative/creativeexchange/services/AppUserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ public void updateProfilePicture(AppUser userPrincipal,
if (ext == null) throw new InvalidContentTypeException("File type must be a jpg or png");

String path = profileImageRoot + userPrincipal.getId() + ext;
System.out.println("=============DEBUG============");
System.out.println(path);
System.out.println("=============DEBUG============");
InputStream stream = new BufferedInputStream(image.getInputStream());

try {
Expand All @@ -56,9 +53,6 @@ public void updateProfilePicture(AppUser userPrincipal,
}

public String getProfilePicturePath(AppUser userPrincipal) {
System.out.println("=============DEBUG============");
System.out.println(profileImageRoot + userPrincipal.getId() + userPrincipal.getImageExtension());
System.out.println("=============DEBUG============");
return userPrincipal.hasProfilePicture() ?
fileUploadService.getURL(
profileImageRoot + userPrincipal.getId() +
Expand Down