Skip to content
Snippets Groups Projects
Commit 9980f074 authored by Nicolay Schiøll-Johansen's avatar Nicolay Schiøll-Johansen
Browse files

Merge branch 'fix' into 'dev'

bugfix

See merge request !57
parents 16e0bb3f 512cf907
No related branches found
No related tags found
2 merge requests!104Weekly merge to Master,!57bugfix
Pipeline #76482 passed
......@@ -12,6 +12,9 @@ public class DataExchange {
private String searchField;
private List<File> uploadedFiles;
public DataExchange(){
searchField = "";
}
public List<File> getUploadedFiles() {
return uploadedFiles;
}
......
......@@ -103,6 +103,15 @@ public class Explore {
App.setRoot("upload");
}
/**
* Method that changes stage to View Picture page for the image that was clicked
* @param mouseEvent
* @throws IOException
*/
public void switchToPicture(MouseEvent mouseEvent) throws IOException {
App.setRoot("view_picture");
}
/**
* Method that updates content to previous "page"
* @param actionEvent
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment