Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Max Mecklin
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 90bf9f43
authored
Sep 04, 2013
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Random bugfixes.
Anon clicking a place. Uplading file without file failed.
1 parent
8e02a635
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/map/PlaceView.java
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
View file @
90bf9f4
...
@@ -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
\u
00E4kym
\u
00E4
\u
00E4n
usercart.showoverview
=
Vie tarkastusn
\u
00E4kym
\u
00E4
\u
00E4n
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
View file @
90bf9f4
...
@@ -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
\u
00E4
submenu.license.manageCodes
=
Hallinnoi lisenssej
\u
00E4
submenu.license.viewCodes
=
N
\u
00E4yt
\u
00E4 koodit
submenu.license.viewCodes
=
N
\u
00E4yt
\u
00E4 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
\u
00E4hett
\u
00E4
\u
00E4
user.imageUploaded
=
Kuva l
\u
00E4hetetty.
user.imageUploaded
=
Kuva l
\u
00E4hetetty.
user.imagelist
=
Tallennetut kuvat
user.imagelist
=
Tallennetut kuvat
user.imagesubmit
=
L
\u
00E4het
\u
00E4 kuva
user.imagesubmit
=
L
\u
00E4het
\u
00E4 kuva
...
...
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/map/PlaceView.java
View file @
90bf9f4
...
@@ -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
{
...
...
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java
View file @
90bf9f4
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment