Commit 90bf9f43 by Tuomas Riihimäki

Random bugfixes.

Anon clicking a place. Uplading file without file failed.
1 parent 8e02a635
...@@ -224,13 +224,15 @@ resetmailSent.body = Email has been sent containing a link where you can chang ...@@ -224,13 +224,15 @@ resetmailSent.body = Email has been sent containing a link where you can chang
resetmailSent.header = Email sent resetmailSent.header = Email sent
submenu.NotImplementedYet = Not implemented submenu.NotImplementedYet = Not implemented
submenu.frontpage = Frontpage
subnavi.cards = \u0009\u0009 subnavi.cards = \u0009\u0009
topnavi.license = Lisenssikoodit topnavi.license = Lisenssikoodit
user.cropImage = Crop user.cropImage = Crop
user.unauthenticated = Kirjautumaton user.imageUpload.imageNotFound = Select image to upload
user.unauthenticated = Kirjautumaton
usercart.downloadCsv = CSV usercart.downloadCsv = CSV
usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n
...@@ -886,6 +886,7 @@ submenu.foodadmin.createTemplate = Luo tilauspohja ...@@ -886,6 +886,7 @@ submenu.foodadmin.createTemplate = Luo tilauspohja
submenu.foodadmin.listTemplates = Muokkaa tilauspohjia submenu.foodadmin.listTemplates = Muokkaa tilauspohjia
submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset
submenu.foodwave.list = Ruokatilaukset submenu.foodwave.list = Ruokatilaukset
submenu.frontpage = Etusivu
submenu.index = Etusivu submenu.index = Etusivu
submenu.license.manageCodes = Hallinnoi lisenssej\u00E4 submenu.license.manageCodes = Hallinnoi lisenssej\u00E4
submenu.license.viewCodes = N\u00E4yt\u00E4 koodit submenu.license.viewCodes = N\u00E4yt\u00E4 koodit
...@@ -1055,6 +1056,7 @@ user.foodwave.products.title = Valitse tuotteet ...@@ -1055,6 +1056,7 @@ user.foodwave.products.title = Valitse tuotteet
user.foodwavelist.title = Valitse Ruokatilaus user.foodwavelist.title = Valitse Ruokatilaus
user.hasImage = Kuva user.hasImage = Kuva
user.imageTooBig = Kuva on liian suuri user.imageTooBig = Kuva on liian suuri
user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00E4\u00E4
user.imageUploaded = Kuva l\u00E4hetetty. user.imageUploaded = Kuva l\u00E4hetetty.
user.imagelist = Tallennetut kuvat user.imagelist = Tallennetut kuvat
user.imagesubmit = L\u00E4het\u00E4 kuva user.imagesubmit = L\u00E4het\u00E4 kuva
......
...@@ -88,7 +88,8 @@ public class PlaceView extends GenericCDIView { ...@@ -88,7 +88,8 @@ public class PlaceView extends GenericCDIView {
place = placebean.findPlace(getCurrentMap(), x, y); place = placebean.findPlace(getCurrentMap(), x, y);
logger.debug("Clicked place: {}", place); logger.debug("Clicked place: {}", place);
if (place != null) { //Don't try to calculate stuff is not logged in
if (permbean.isLoggedIn() && place != null) {
logger.info("placeinfo User {}, group {}", place.getCurrentUser(), place.getGroup()); logger.info("placeinfo User {}, group {}", place.getCurrentUser(), place.getGroup());
...@@ -102,6 +103,7 @@ public class PlaceView extends GenericCDIView { ...@@ -102,6 +103,7 @@ public class PlaceView extends GenericCDIView {
BigDecimal balance = user.getAccountBalance(); BigDecimal balance = user.getAccountBalance();
BigDecimal price = null; BigDecimal price = null;
if (permbean.isCurrentUser(user)) { if (permbean.isCurrentUser(user)) {
price = placebean.getTotalReservationPrice(place); price = placebean.getTotalReservationPrice(place);
} else { } else {
......
...@@ -234,7 +234,7 @@ public class UserView extends GenericCDIView { ...@@ -234,7 +234,7 @@ public class UserView extends GenericCDIView {
} }
public String sendImage() throws IOException { public String sendImage() throws IOException {
if (image == null) { if (image == null || image.getSize() < 1) {
super.addFaceMessage("user.imageUpload.imageNotFound"); super.addFaceMessage("user.imageUpload.imageNotFound");
} else { } else {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!