Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
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 4fa18554
authored
May 12, 2012
by
Juho Juopperi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
le fix
1 parent
f5d994c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/TokenView.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java
View file @
4fa1855
...
...
@@ -20,6 +20,7 @@ import fi.insomnia.bortal.beans.UserBeanLocal;
import
fi.insomnia.bortal.enums.apps.MapPermission
;
import
fi.insomnia.bortal.exceptions.BortalCatchableException
;
import
fi.insomnia.bortal.model.EventMap
;
import
fi.insomnia.bortal.model.EventUser
;
import
fi.insomnia.bortal.model.Place
;
import
fi.insomnia.bortal.model.User
;
import
fi.insomnia.bortal.web.annotations.SelectedUser
;
...
...
@@ -45,13 +46,13 @@ public class PlaceView extends GenericCDIView {
@Inject
@SelectedUser
private
User
user
;
private
Event
User
user
;
@Inject
private
EventMap
currentMap
;
private
String
searchuser
;
private
transient
ListDataModel
<
User
>
userlist
;
private
transient
ListDataModel
<
Event
User
>
userlist
;
@EJB
private
AccountEventBeanLocal
acbean
;
...
...
@@ -135,7 +136,7 @@ public class PlaceView extends GenericCDIView {
public
String
reserveForUser
()
{
try
{
User
user
=
userlist
.
getRowData
();
Event
User
user
=
userlist
.
getRowData
();
if
(
placebean
.
reservePlace
(
place
,
userlist
.
getRowData
()))
{
placebean
.
buySelectedPlaces
(
user
);
}
...
...
@@ -151,7 +152,7 @@ public class PlaceView extends GenericCDIView {
public
String
searchUser
()
{
super
.
beginConversation
();
userlist
=
new
ListDataModel
<
User
>(
userbean
.
getUsers
(
0
,
0
,
null
,
searchuser
).
getResults
());
userlist
=
new
ListDataModel
<
Event
User
>(
userbean
.
getUsers
(
0
,
0
,
null
,
searchuser
).
getResults
());
return
null
;
}
...
...
@@ -189,11 +190,11 @@ public class PlaceView extends GenericCDIView {
return
searchuser
;
}
public
void
setUserlist
(
ListDataModel
<
User
>
userlist
)
{
public
void
setUserlist
(
ListDataModel
<
Event
User
>
userlist
)
{
this
.
userlist
=
userlist
;
}
public
ListDataModel
<
User
>
getUserlist
()
{
public
ListDataModel
<
Event
User
>
getUserlist
()
{
return
userlist
;
}
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/TokenView.java
View file @
4fa1855
...
...
@@ -7,7 +7,7 @@ import javax.inject.Named;
import
fi.insomnia.bortal.beans.PlaceGroupBeanLocal
;
import
fi.insomnia.bortal.enums.apps.MapPermission
;
import
fi.insomnia.bortal.model.
I
User
;
import
fi.insomnia.bortal.model.
Event
User
;
import
fi.insomnia.bortal.web.annotations.SelectedUser
;
import
fi.insomnia.bortal.web.cdiview.GenericCDIView
;
...
...
@@ -21,7 +21,7 @@ public class TokenView extends GenericCDIView {
@Inject
@SelectedUser
private
I
User
user
;
private
Event
User
user
;
@EJB
private
transient
PlaceGroupBeanLocal
placegroupbean
;
...
...
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