Merge remote-tracking branch 'origin/needValdigTitleAtAlbum' into needValdigTitleAtAlbum

src/main/java/NTNU/IDATT1002/controllers/CreateAlbum.java

@@ -160,6 +160,7 @@ public class CreateAlbum implements Initializable {
     String title = album_title_field.getText();
     String description = album_desc_field.getText();
     String tags = album_tag_field.getText();
+<<<<<<< HEAD
 
     if (tags.isEmpty()){ tags = " "; }
 
@@ -170,6 +171,17 @@ public class CreateAlbum implements Initializable {
       if (description.isEmpty()) {
         description = "No desripton added";
       }
+=======
+    List<Tag> tagsToAdd = TagService.getTagsFromString(tags);
+    User user = ApplicationState.getCurrentUser();
+
+      //temporary solution for the toString problem with album log creation
+      if (description.isEmpty()) {
+          description = "No desripton";
+      } if (tags.isEmpty()){
+        tags = " ";
+    }
+>>>>>>> needValdigTitleAtAlbum
 
     List<Node> imageContainers = new ArrayList<>(fileContainer.getChildren());
     List<String> checkedImagesId = new ArrayList<>();
@@ -192,7 +204,11 @@ public class CreateAlbum implements Initializable {
         createdAlbum.ifPresent(album -> {
           App.ex.setChosenAlbumId(album.getId());
           try {
+<<<<<<< HEAD
             App.setRoot("view_album");
+=======
+            App.setRoot("main");
+>>>>>>> needValdigTitleAtAlbum
           } catch (IOException e) {
             e.printStackTrace();
           }
@@ -202,7 +218,11 @@ public class CreateAlbum implements Initializable {
         createdAlbum.ifPresent(album -> {
           App.ex.setChosenAlbumId(album.getId());
           try {
+<<<<<<< HEAD
             App.setRoot("view_album");
+=======
+            App.setRoot("main");
+>>>>>>> needValdigTitleAtAlbum
           } catch (IOException e) {
             e.printStackTrace();
           }